Skip to content

Commit

Permalink
Q schema changes (#9)
Browse files Browse the repository at this point in the history
* q schema changes

* bump version

* add a method to make metric modulation markup

* adds a metric modulation markup to segment b

* add metric modulation markup to segment c
  • Loading branch information
nivlekp authored Oct 1, 2024
1 parent 024cb30 commit 5009e8b
Show file tree
Hide file tree
Showing 15 changed files with 6,416 additions and 8,314 deletions.
2,393 changes: 971 additions & 1,422 deletions minamidera/builds/score/_sections/a.ily

Large diffs are not rendered by default.

2,304 changes: 935 additions & 1,369 deletions minamidera/builds/score/_sections/b.ily

Large diffs are not rendered by default.

2,595 changes: 1,254 additions & 1,341 deletions minamidera/builds/score/_sections/c.ily

Large diffs are not rendered by default.

25 changes: 21 additions & 4 deletions minamidera/library.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
pang.gen_pitches_from_sieve(
sieve=(PATTERN_0 | PATTERN_1) & (PATTERN_2 | PATTERN_3),
origin=0,
low=-36,
high=48,
low=-39,
high=39,
)
),
(1, 2),
Expand All @@ -38,9 +38,9 @@

INTENSITY_SETS = ({-1, 0}, {-2, 2})

DENSITY_SETS = ({0.7}, {3.0})
DENSITY_SETS = ({0.5}, {2.5})

DURATION_SETS = ({0.3}, {1.0})
DURATION_SETS = ({0.2}, {0.4})


PIANO_MUSIC_VOICE_0_NAME = "Piano.Music.0"
Expand Down Expand Up @@ -91,6 +91,23 @@ def move_music_ily_from_segment_directory_to_build_directory(segment_name: str)
shutil.copy(music_ily_path, target_path)


def make_metric_modulation_markup(
left_rhythm_string: str, right_rhythm_string: str
) -> abjad.Markup:
return abjad.Markup(
abjad.string.normalize(
" ".join(
[
r"\markup",
r"\tszkiu-metric-modulation",
left_rhythm_string,
right_rhythm_string,
]
)
)
)


class TrebleNoteServer(pang.NoteServer):
def can_serve(self, sound_point: pang.SoundPoint) -> bool:
pitch = sound_point.pitch
Expand Down
12 changes: 6 additions & 6 deletions minamidera/segments/a/__metadata__.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"duration": 206.15384615384616,
"duration": 198.0,
"last_metronome_mark": {
"reference_duration": "1/4",
"units_per_minute": 78.0
"units_per_minute": 70.0
},
"last_time_signature": "4/4",
"empty_beatspan": "1/8",
"last_time_signature": "3/4",
"empty_beatspan": "7/16",
"per_voice_metadata": {
"Piano.Music.0": {
"number_of_all_discarded_q_events": 6,
"number_of_all_discarded_q_events": 0,
"number_of_discarded_pitched_q_events": 0
},
"Piano.Music.1": {
"number_of_all_discarded_q_events": 2,
"number_of_all_discarded_q_events": 1,
"number_of_discarded_pitched_q_events": 0
}
}
Expand Down
Loading

0 comments on commit 5009e8b

Please sign in to comment.