diff --git a/abjadext/rmakers/functions.py b/abjadext/rmakers/functions.py index d86273f..87b6e2c 100644 --- a/abjadext/rmakers/functions.py +++ b/abjadext/rmakers/functions.py @@ -315,7 +315,7 @@ def after_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -329,7 +329,7 @@ def after_grace_container( } } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { c'4 c'4 @@ -378,7 +378,7 @@ def after_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -392,7 +392,7 @@ def after_grace_container( } } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { c'4 c'4 @@ -1013,7 +1013,7 @@ def before_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -1082,7 +1082,7 @@ def before_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -1149,7 +1149,7 @@ def before_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -1220,7 +1220,7 @@ def before_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -1291,7 +1291,7 @@ def before_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -1368,7 +1368,7 @@ def before_grace_container( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -1503,7 +1503,7 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -1512,21 +1512,21 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { \time 6/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 8/16 c'8 @@ -1574,7 +1574,7 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -1583,21 +1583,21 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { \time 6/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 8/10 + \tuplet 10/8 { \time 8/16 c'8 @@ -1639,7 +1639,7 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -1648,21 +1648,21 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 8/10 + \tuplet 10/8 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 12/10 + \tuplet 10/12 { \time 6/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 16/20 + \tuplet 20/16 { \time 8/16 c'8 @@ -1703,7 +1703,7 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -1712,21 +1712,21 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 8/10 + \tuplet 10/8 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 12/10 + \tuplet 10/12 { \time 6/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 16/20 + \tuplet 20/16 { \time 8/16 c'8 @@ -1771,7 +1771,7 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -1780,21 +1780,21 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 8/10 + \tuplet 10/8 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 12/10 + \tuplet 10/12 { \time 6/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 16/20 + \tuplet 20/16 { \time 8/16 c'8 @@ -1834,7 +1834,7 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -1843,21 +1843,21 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 8/10 + \tuplet 10/8 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 12/10 + \tuplet 10/12 { \time 6/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 16/20 + \tuplet 20/16 { \time 8/16 c'8 @@ -1897,7 +1897,7 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -1906,21 +1906,21 @@ def denominator(argument, denominator: int | abjad.typings.Duration) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 8/10 + \tuplet 10/8 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 12/10 + \tuplet 10/12 { \time 6/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 16/20 + \tuplet 20/16 { \time 8/16 c'8 @@ -2040,7 +2040,7 @@ def extract_trivial(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/3 + \tuplet 3/3 { \time 3/8 c'8 @@ -2050,7 +2050,7 @@ def extract_trivial(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/3 + \tuplet 3/3 { c'8 [ @@ -2200,7 +2200,7 @@ def force_augmentation(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -2210,7 +2210,7 @@ def force_augmentation(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2219,7 +2219,7 @@ def force_augmentation(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2261,7 +2261,7 @@ def force_augmentation(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { \time 2/8 c'16 @@ -2271,7 +2271,7 @@ def force_augmentation(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { c'16 [ @@ -2280,7 +2280,7 @@ def force_augmentation(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { c'16 [ @@ -2360,7 +2360,7 @@ def force_diminution(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { c'16 [ @@ -2377,7 +2377,7 @@ def force_diminution(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { c'16 [ @@ -2428,7 +2428,7 @@ def force_diminution(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2445,7 +2445,7 @@ def force_diminution(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2632,7 +2632,7 @@ def force_repeat_tie( { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -2642,7 +2642,7 @@ def force_repeat_tie( ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2651,7 +2651,7 @@ def force_repeat_tie( ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2660,7 +2660,7 @@ def force_repeat_tie( ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2694,7 +2694,7 @@ def force_repeat_tie( { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -2703,7 +2703,7 @@ def force_repeat_tie( c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2712,7 +2712,7 @@ def force_repeat_tie( c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -2721,7 +2721,7 @@ def force_repeat_tie( c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3153,7 +3153,7 @@ def hide_trivial(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/3 + \tuplet 3/3 { \time 3/8 c'8 @@ -3163,7 +3163,7 @@ def hide_trivial(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/3 + \tuplet 3/3 { c'8 [ @@ -3310,7 +3310,7 @@ def on_beat_grace_container( \context Voice = "RhythmMaker.Music" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/4 c'4 @@ -3654,7 +3654,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -3663,7 +3663,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3672,7 +3672,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3681,7 +3681,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3690,7 +3690,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3699,7 +3699,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3748,7 +3748,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -3759,7 +3759,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3769,7 +3769,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3779,7 +3779,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3789,7 +3789,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -3799,7 +3799,7 @@ def repeat_tie(argument, *, tag: abjad.Tag | None = None) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -4023,7 +4023,7 @@ def rewrite_rest_filled( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 4/16 r16 @@ -4032,7 +4032,7 @@ def rewrite_rest_filled( r16 r16 } - \times 4/5 + \tuplet 5/4 { r16 r16 @@ -4041,7 +4041,7 @@ def rewrite_rest_filled( r16 } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { \time 5/16 r16 @@ -4052,7 +4052,7 @@ def rewrite_rest_filled( r16 } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { r16 r16 @@ -4195,7 +4195,7 @@ def rewrite_rest_filled( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { \time 3/8 c'8. @@ -4205,7 +4205,7 @@ def rewrite_rest_filled( r16 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 r4 @@ -4213,7 +4213,7 @@ def rewrite_rest_filled( r8. } \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { \time 3/8 r8. @@ -4224,7 +4224,7 @@ def rewrite_rest_filled( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'8 @@ -4269,7 +4269,7 @@ def rewrite_rest_filled( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { \time 3/8 c'8. @@ -4279,13 +4279,13 @@ def rewrite_rest_filled( r16 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 r2 } \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { \time 3/8 r8. @@ -4296,7 +4296,7 @@ def rewrite_rest_filled( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'8 @@ -4375,26 +4375,26 @@ def rewrite_sustained(argument, *, tag: abjad.Tag | None = None) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 4/16 c'4. } - \times 4/5 + \tuplet 5/4 { c'4 ~ c'16 ~ } - \times 4/5 + \tuplet 5/4 { c'4 ~ c'16 ~ } - \times 4/5 + \tuplet 5/4 { c'4 c'16 @@ -4460,24 +4460,24 @@ def rewrite_sustained(argument, *, tag: abjad.Tag | None = None) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { c'4 ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { c'4 ~ } - \times 4/5 + \tuplet 5/4 { c'4 c'16 @@ -4533,7 +4533,7 @@ def rewrite_sustained(argument, *, tag: abjad.Tag | None = None) -> None: ~ c'4 ~ - \times 4/5 + \tuplet 5/4 { c'4 c'16 @@ -4575,7 +4575,7 @@ def rewrite_sustained(argument, *, tag: abjad.Tag | None = None) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -4586,7 +4586,7 @@ def rewrite_sustained(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -4597,12 +4597,12 @@ def rewrite_sustained(argument, *, tag: abjad.Tag | None = None) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 2/2 + \tuplet 2/2 { c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 2/2 + \tuplet 2/2 { c'4 } @@ -4775,7 +4775,7 @@ def swap_trivial(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/3 + \tuplet 3/3 { \time 3/8 c'8 @@ -4785,7 +4785,7 @@ def swap_trivial(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/3 + \tuplet 3/3 { c'8 [ @@ -4858,7 +4858,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -4868,7 +4868,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -4877,7 +4877,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -4886,7 +4886,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -4895,7 +4895,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -4904,7 +4904,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -5149,7 +5149,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -5160,7 +5160,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -5170,7 +5170,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -5180,7 +5180,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -5190,7 +5190,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -5200,7 +5200,7 @@ def tie(argument, *, tag: abjad.Tag | None = None) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -5436,7 +5436,7 @@ def trivialize(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5444,14 +5444,14 @@ def trivialize(argument) -> None: c'8. ] } - \times 2/3 + \tuplet 3/2 { \time 4/8 c'4. c'4. } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5459,7 +5459,7 @@ def trivialize(argument) -> None: c'8. ] } - \times 2/3 + \tuplet 3/2 { \time 4/8 c'4. @@ -5504,7 +5504,7 @@ def trivialize(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5513,14 +5513,14 @@ def trivialize(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'4 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5529,7 +5529,7 @@ def trivialize(argument) -> None: ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'4 @@ -5576,7 +5576,7 @@ def trivialize(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5586,7 +5586,7 @@ def trivialize(argument) -> None: ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'4 @@ -5594,7 +5594,7 @@ def trivialize(argument) -> None: ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5604,7 +5604,7 @@ def trivialize(argument) -> None: ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'4 @@ -5651,7 +5651,7 @@ def trivialize(argument) -> None: \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5662,7 +5662,7 @@ def trivialize(argument) -> None: ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'4 @@ -5671,7 +5671,7 @@ def trivialize(argument) -> None: ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5682,7 +5682,7 @@ def trivialize(argument) -> None: ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'4 @@ -6531,7 +6531,7 @@ def untie(argument) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -6542,7 +6542,7 @@ def untie(argument) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6552,7 +6552,7 @@ def untie(argument) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6562,7 +6562,7 @@ def untie(argument) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6573,7 +6573,7 @@ def untie(argument) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6583,7 +6583,7 @@ def untie(argument) -> None: ] ~ } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6634,7 +6634,7 @@ def untie(argument) -> None: { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'8 @@ -6645,7 +6645,7 @@ def untie(argument) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6655,7 +6655,7 @@ def untie(argument) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6665,7 +6665,7 @@ def untie(argument) -> None: c'8 ] } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6676,7 +6676,7 @@ def untie(argument) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -6686,7 +6686,7 @@ def untie(argument) -> None: ] \repeatTie } - \times 2/3 + \tuplet 3/2 { c'8 [ diff --git a/abjadext/rmakers/makers.py b/abjadext/rmakers/makers.py index f592cb4..4c43c75 100644 --- a/abjadext/rmakers/makers.py +++ b/abjadext/rmakers/makers.py @@ -804,7 +804,7 @@ def accelerando( \context Voice = "Voice" { \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #right @@ -819,7 +819,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -833,7 +833,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #right @@ -848,7 +848,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -895,7 +895,7 @@ def accelerando( \context Voice = "Voice" { \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #left @@ -911,7 +911,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #left @@ -926,7 +926,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #left @@ -942,7 +942,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #left @@ -990,7 +990,7 @@ def accelerando( \context Voice = "Voice" { \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #right @@ -1005,7 +1005,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #left @@ -1020,7 +1020,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #right @@ -1035,7 +1035,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #left @@ -1083,7 +1083,7 @@ def accelerando( \context Voice = "Voice" { \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) { \rhythm { 2 } + \rhythm { 8 } } - \times 1/1 + \tuplet 1/1 { \time 5/8 \once \override Beam.grow-direction = #right @@ -1100,7 +1100,7 @@ def accelerando( } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -1208,7 +1208,7 @@ def even_division( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 5/8 + \tuplet 8/5 { \time 5/16 c'4 @@ -1221,7 +1221,7 @@ def even_division( c'8 ] \tweak text #tuplet-number::calc-fraction-text - \times 3/4 + \tuplet 4/3 { c'8 [ @@ -1492,7 +1492,7 @@ def even_division( { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 4/8 c'16 @@ -1511,7 +1511,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1527,7 +1527,7 @@ def even_division( c'16 ] } - \times 2/3 + \tuplet 3/2 { \time 4/8 c'16 @@ -1546,7 +1546,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1600,7 +1600,7 @@ def even_division( { \context Voice = "Voice" { - \times 4/6 + \tuplet 6/4 { \time 4/8 c'16 @@ -1619,7 +1619,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1635,7 +1635,7 @@ def even_division( c'16 ] } - \times 4/6 + \tuplet 6/4 { \time 4/8 c'16 @@ -1654,7 +1654,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1708,7 +1708,7 @@ def even_division( { \context Voice = "Voice" { - \times 8/12 + \tuplet 12/8 { \time 4/8 c'16 @@ -1727,7 +1727,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1743,7 +1743,7 @@ def even_division( c'16 ] } - \times 8/12 + \tuplet 12/8 { \time 4/8 c'16 @@ -1762,7 +1762,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1816,7 +1816,7 @@ def even_division( { \context Voice = "Voice" { - \times 16/24 + \tuplet 24/16 { \time 4/8 c'16 @@ -1835,7 +1835,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1851,7 +1851,7 @@ def even_division( c'16 ] } - \times 16/24 + \tuplet 24/16 { \time 4/8 c'16 @@ -1870,7 +1870,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'16 @@ -1924,7 +1924,7 @@ def even_division( { \context Voice = "Voice" { - \times 8/12 + \tuplet 12/8 { \time 4/8 c'16 @@ -1943,7 +1943,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/10 + \tuplet 10/6 { \time 3/8 c'16 @@ -1959,7 +1959,7 @@ def even_division( c'16 ] } - \times 8/12 + \tuplet 12/8 { \time 4/8 c'16 @@ -1978,7 +1978,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/10 + \tuplet 10/6 { \time 3/8 c'16 @@ -2047,7 +2047,7 @@ def even_division( c'16 ] \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { c'16 [ @@ -2060,7 +2060,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/8 + \tuplet 8/6 { c'16 [ @@ -2082,7 +2082,7 @@ def even_division( c'16 ] \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { c'16 [ @@ -2175,7 +2175,7 @@ def even_division( c'16 ] \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { c'16 ^ \markup { 1 becomes 1 } @@ -2189,7 +2189,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/8 + \tuplet 8/6 { c'16 ^ \markup { 2 becomes 2 } @@ -2203,7 +2203,7 @@ def even_division( c'16 ] } - \times 6/9 + \tuplet 9/6 { c'16 ^ \markup { 3 becomes 3 } @@ -2219,7 +2219,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/10 + \tuplet 10/6 { c'16 ^ \markup { 4 becomes 4 } @@ -2236,7 +2236,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/11 + \tuplet 11/6 { c'16 ^ \markup { 5 becomes 5 } @@ -2263,7 +2263,7 @@ def even_division( c'16 ] \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { c'16 ^ \markup { 7 becomes 1 } @@ -2277,7 +2277,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/8 + \tuplet 8/6 { c'16 ^ \markup { 8 becomes 2 } @@ -2291,7 +2291,7 @@ def even_division( c'16 ] } - \times 6/9 + \tuplet 9/6 { c'16 ^ \markup { 9 becomes 3 } @@ -2307,7 +2307,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/10 + \tuplet 10/6 { c'16 ^ \markup { 10 becomes 4 } @@ -2324,7 +2324,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/11 + \tuplet 11/6 { c'16 ^ \markup { 11 becomes 5 } @@ -2424,7 +2424,7 @@ def even_division( c'16 ] \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { c'16 ^ \markup { -1 becomes -1 } @@ -2436,7 +2436,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/4 + \tuplet 4/6 { c'16 ^ \markup { -2 becomes -2 } @@ -2456,7 +2456,7 @@ def even_division( c'16 ] \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { c'16 ^ \markup { -4 becomes -1 } @@ -2468,7 +2468,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/4 + \tuplet 4/6 { c'16 ^ \markup { -5 becomes -2 } @@ -2488,7 +2488,7 @@ def even_division( c'16 ] \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { c'16 ^ \markup { -7 becomes -1 } @@ -2500,7 +2500,7 @@ def even_division( ] } \tweak text #tuplet-number::calc-fraction-text - \times 6/4 + \tuplet 4/6 { c'16 ^ \markup { -8 becomes -2 } @@ -2876,7 +2876,7 @@ def incised( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { \time 5/16 r16 @@ -2884,21 +2884,21 @@ def incised( r16 } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { r16 c'4 r16 } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { r16 c'4 r16 } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { r16 c'4 @@ -3022,7 +3022,7 @@ def incised( \context Voice = "Voice" { \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { \time 5/16 c'8 @@ -3031,14 +3031,14 @@ def incised( c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ @@ -3046,7 +3046,7 @@ def incised( ] } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 [ @@ -3054,14 +3054,14 @@ def incised( c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ @@ -3069,7 +3069,7 @@ def incised( ] } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 [ @@ -3077,14 +3077,14 @@ def incised( c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ @@ -3092,7 +3092,7 @@ def incised( ] } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 [ @@ -3100,14 +3100,14 @@ def incised( c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ c'32 } \tweak edge-height #'(0.7 . 0) - \times 32/48 + \tuplet 48/32 { c'8 ~ @@ -4040,7 +4040,7 @@ def note( \context Voice = "Voice" { \tweak edge-height #'(0.7 . 0) - \times 8/14 + \tuplet 14/8 { #(ly:expect-warning "strange time signature found") \time 5/14 @@ -4049,7 +4049,7 @@ def note( c'8 } \tweak edge-height #'(0.7 . 0) - \times 4/7 + \tuplet 7/4 { #(ly:expect-warning "strange time signature found") \time 3/7 @@ -4095,7 +4095,7 @@ def note( { \tweak text #tuplet-number::calc-fraction-text \tweak edge-height #'(0.7 . 0) - \times 8/7 + \tuplet 7/8 { #(ly:expect-warning "strange time signature found") \time 5/14 @@ -4105,7 +4105,7 @@ def note( } \tweak text #tuplet-number::calc-fraction-text \tweak edge-height #'(0.7 . 0) - \times 8/7 + \tuplet 7/8 { #(ly:expect-warning "strange time signature found") \time 3/7 @@ -4459,7 +4459,7 @@ def talea( c'8. ] } - \times 8/9 + \tuplet 9/8 { \time 4/8 c'4 @@ -4476,7 +4476,7 @@ def talea( c'4 c'16 } - \times 8/9 + \tuplet 9/8 { \time 4/8 c'8 @@ -4521,7 +4521,7 @@ def talea( c'8. ] } - \times 4/5 + \tuplet 5/4 { \time 4/8 c'4 @@ -4540,7 +4540,7 @@ def talea( ] ~ } - \times 4/5 + \tuplet 5/4 { \time 4/8 c'16 @@ -4590,7 +4590,7 @@ def talea( ] } \tweak text #tuplet-number::calc-fraction-text - \times 8/7 + \tuplet 7/8 { \time 4/8 c'4 @@ -4608,7 +4608,7 @@ def talea( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 8/7 + \tuplet 7/8 { \time 4/8 c'16 @@ -4939,21 +4939,21 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 1/2 c'4. c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4. c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 5/16 c'8. @@ -4962,7 +4962,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { c'8. [ @@ -5006,28 +5006,28 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 1/2 c'4 r4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/4 + \tuplet 4/3 { \time 3/8 c'4. c'8 } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { \time 5/16 c'8. r8. } \tweak text #tuplet-number::calc-fraction-text - \times 5/4 + \tuplet 4/5 { c'8. [ @@ -5071,7 +5071,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { \time 5/8 c'8. @@ -5082,7 +5082,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'16. @@ -5093,7 +5093,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 6/8 c'8. @@ -5104,7 +5104,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'8 @@ -5151,7 +5151,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { \time 5/8 c'8. @@ -5162,7 +5162,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'16. @@ -5173,7 +5173,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 6/8 c'8. @@ -5184,7 +5184,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 4/8 c'8 @@ -5230,7 +5230,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 5/9 + \tuplet 9/5 { \set stemLeftBeamCount = 0 \set stemRightBeamCount = 1 @@ -5252,7 +5252,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4. @@ -5265,7 +5265,7 @@ def tuplet( c'8 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \set stemLeftBeamCount = 1 \set stemRightBeamCount = 1 @@ -5285,7 +5285,7 @@ def tuplet( c'8 ] } - \times 4/5 + \tuplet 5/4 { \time 4/8 c'4. @@ -5334,14 +5334,14 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 1/2 c'4 c'4. } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'16. @@ -5349,7 +5349,7 @@ def tuplet( c'16. } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 5/16 c'8 @@ -5396,7 +5396,7 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 1/2 c'4 @@ -5404,7 +5404,7 @@ def tuplet( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'16. @@ -5413,7 +5413,7 @@ def tuplet( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 5/16 c'8 @@ -5461,7 +5461,7 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 1/2 c'4 @@ -5469,7 +5469,7 @@ def tuplet( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'16. @@ -5477,7 +5477,7 @@ def tuplet( c'16. } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 5/16 c'8 @@ -5487,7 +5487,7 @@ def tuplet( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { c'16. r8. @@ -5531,18 +5531,18 @@ def tuplet( { \context Voice = "Voice" { - \times 2/3 + \tuplet 3/2 { \time 2/8 c'4 c'8 } - \times 2/3 + \tuplet 3/2 { c'4 c'8 } - \times 2/3 + \tuplet 3/2 { \time 4/8 c'2 @@ -5586,7 +5586,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { \time 2/8 c'8 @@ -5595,7 +5595,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { c'8 [ @@ -5603,7 +5603,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 4/3 + \tuplet 3/4 { \time 4/8 c'4 @@ -5647,7 +5647,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 2/8 c'8 @@ -5656,7 +5656,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5665,7 +5665,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 7/16 c'8.. @@ -5712,7 +5712,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 2/8 c'8 @@ -5721,14 +5721,14 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/4 + \tuplet 4/3 { \time 3/8 c'4 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 7/8 + \tuplet 8/7 { \time 7/16 c'4 @@ -5772,7 +5772,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 2/8 c'8 @@ -5781,7 +5781,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 3/8 c'8. @@ -5790,7 +5790,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 7/16 c'8.. @@ -5837,7 +5837,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 2/8 c'8 @@ -5846,7 +5846,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 3/2 + \tuplet 2/3 { \time 3/8 c'8 @@ -5855,7 +5855,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 7/4 + \tuplet 4/7 { \time 7/16 c'8 @@ -5901,25 +5901,25 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4. r4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/2 + \tuplet 2/3 { c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { r4 c'4. } \tweak text #tuplet-number::calc-fraction-text - \times 3/2 + \tuplet 2/3 { c'8 [ @@ -5966,25 +5966,25 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4. r4 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { c'4. } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { r4 c'4. } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { c'8. [ @@ -6031,25 +6031,25 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4. r4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/2 + \tuplet 2/3 { c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { r4 c'4. } \tweak text #tuplet-number::calc-fraction-text - \times 3/2 + \tuplet 2/3 { c'8 [ @@ -6096,7 +6096,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4 @@ -6104,7 +6104,7 @@ def tuplet( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 2/8 c'8 @@ -6114,7 +6114,7 @@ def tuplet( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4 @@ -6122,7 +6122,7 @@ def tuplet( ~ } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 2/8 c'8 @@ -6172,7 +6172,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4 @@ -6186,7 +6186,7 @@ def tuplet( ] ~ \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4 @@ -6241,7 +6241,7 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4 @@ -6257,7 +6257,7 @@ def tuplet( ] ~ \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4 @@ -6312,7 +6312,7 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 3/8 c'4. @@ -6320,7 +6320,7 @@ def tuplet( } \time 4/8 r2 - \times 4/5 + \tuplet 5/4 { \time 3/8 c'4. @@ -6368,7 +6368,7 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -6376,20 +6376,20 @@ def tuplet( c'8 ] } - \times 4/5 + \tuplet 5/4 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { \time 6/16 c'16 c'4 } - \times 4/5 + \tuplet 5/4 { \time 8/16 c'8 @@ -6435,7 +6435,7 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -6443,20 +6443,20 @@ def tuplet( c'8 ] } - \times 4/5 + \tuplet 5/4 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { \time 6/16 c'16 c'4 } - \times 8/10 + \tuplet 10/8 { \time 8/16 c'8 @@ -6501,7 +6501,7 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -6509,20 +6509,20 @@ def tuplet( c'8 ] } - \times 8/10 + \tuplet 10/8 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 12/10 + \tuplet 10/12 { \time 6/16 c'16 c'4 } - \times 16/20 + \tuplet 20/16 { \time 8/16 c'8 @@ -6567,7 +6567,7 @@ def tuplet( { \context Voice = "Voice" { - \times 8/10 + \tuplet 10/8 { \time 2/16 c'32 @@ -6575,20 +6575,20 @@ def tuplet( c'8 ] } - \times 16/20 + \tuplet 20/16 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 24/20 + \tuplet 20/24 { \time 6/16 c'16 c'4 } - \times 32/40 + \tuplet 40/32 { \time 8/16 c'8 @@ -6634,7 +6634,7 @@ def tuplet( { \context Voice = "Voice" { - \times 8/10 + \tuplet 10/8 { \time 2/16 c'32 @@ -6642,20 +6642,20 @@ def tuplet( c'8 ] } - \times 8/10 + \tuplet 10/8 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { \time 6/16 c'16 c'4 } - \times 8/10 + \tuplet 10/8 { \time 8/16 c'8 @@ -6700,7 +6700,7 @@ def tuplet( { \context Voice = "Voice" { - \times 12/15 + \tuplet 15/12 { \time 2/16 c'32 @@ -6708,20 +6708,20 @@ def tuplet( c'8 ] } - \times 12/15 + \tuplet 15/12 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 12/10 + \tuplet 10/12 { \time 6/16 c'16 c'4 } - \times 12/15 + \tuplet 15/12 { \time 8/16 c'8 @@ -6766,7 +6766,7 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 2/16 c'32 @@ -6774,20 +6774,20 @@ def tuplet( c'8 ] } - \times 4/5 + \tuplet 5/4 { \time 4/16 c'16 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 6/5 + \tuplet 5/6 { \time 6/16 c'16 c'4 } - \times 4/5 + \tuplet 5/4 { \time 8/16 c'8 @@ -6830,7 +6830,7 @@ def tuplet( { %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() - \times 4/5 + \tuplet 5/4 %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() { @@ -6849,7 +6849,7 @@ def tuplet( \tweak text #tuplet-number::calc-fraction-text %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() - \times 3/5 + \tuplet 5/3 %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() { @@ -6868,7 +6868,7 @@ def tuplet( \tweak text #tuplet-number::calc-fraction-text %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() - \times 1/1 + \tuplet 1/1 %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() { @@ -6893,7 +6893,7 @@ def tuplet( \tweak text #tuplet-number::calc-fraction-text %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() - \times 1/1 + \tuplet 1/1 %! TUPLET_RHYTHM_MAKER %! rmakers.tuplet() { @@ -6948,21 +6948,21 @@ def tuplet( { \context Voice = "Voice" { - \times 4/5 + \tuplet 5/4 { \time 1/2 c'4. c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/5 + \tuplet 5/3 { \time 3/8 c'4. c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 5/16 c'8. @@ -6971,7 +6971,7 @@ def tuplet( ] } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { c'8. [ @@ -7015,28 +7015,28 @@ def tuplet( \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 1/2 c'4 r4 } \tweak text #tuplet-number::calc-fraction-text - \times 3/4 + \tuplet 4/3 { \time 3/8 c'4. c'8 } \tweak text #tuplet-number::calc-fraction-text - \times 5/6 + \tuplet 6/5 { \time 5/16 c'8. r8. } \tweak text #tuplet-number::calc-fraction-text - \times 5/4 + \tuplet 4/5 { c'8. [ @@ -7080,27 +7080,27 @@ def tuplet( \context Voice = "Voice" { \tweak edge-height #'(0.7 . 0) - \times 4/5 + \tuplet 5/4 { #(ly:expect-warning "strange time signature found") \time 1/5 c'4 } \tweak text #tuplet-number::calc-fraction-text - \times 1/1 + \tuplet 1/1 { \time 1/4 c'4 } \tweak edge-height #'(0.7 . 0) - \times 2/3 + \tuplet 3/2 { #(ly:expect-warning "strange time signature found") \time 1/6 c'4 } \tweak edge-height #'(0.7 . 0) - \times 8/9 + \tuplet 9/8 { #(ly:expect-warning "strange time signature found") \time 7/9 diff --git a/abjadext/rmakers/state.py b/abjadext/rmakers/state.py index d0a7eb8..303a97b 100644 --- a/abjadext/rmakers/state.py +++ b/abjadext/rmakers/state.py @@ -47,7 +47,7 @@ \context Voice = "Voice" { \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -61,7 +61,7 @@ } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #left @@ -77,7 +77,7 @@ } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -119,7 +119,7 @@ \context Voice = "Voice" { \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #left @@ -135,7 +135,7 @@ } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -149,7 +149,7 @@ } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #left @@ -193,7 +193,7 @@ \context Voice = "Voice" { \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -207,7 +207,7 @@ } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } - \times 1/1 + \tuplet 1/1 { \time 4/8 \once \override Beam.grow-direction = #left @@ -223,7 +223,7 @@ } \revert TupletNumber.text \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } - \times 1/1 + \tuplet 1/1 { \time 3/8 \once \override Beam.grow-direction = #right @@ -289,7 +289,7 @@ c'16 c'16 ] - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -298,7 +298,7 @@ ] } c'4 - \times 4/5 + \tuplet 5/4 { c'16 [ @@ -348,7 +348,7 @@ c'16 c'16 ] - \times 2/3 + \tuplet 3/2 { c'8 [ @@ -357,7 +357,7 @@ ] } c'4 - \times 4/5 + \tuplet 5/4 { c'16 [ @@ -422,7 +422,7 @@ c'4 c'8 ~ - \times 8/9 + \tuplet 9/8 { \time 4/8 c'8 @@ -431,7 +431,7 @@ ~ } \tweak text #tuplet-number::calc-fraction-text - \times 3/4 + \tuplet 4/3 { \time 3/8 c'16 @@ -481,7 +481,7 @@ \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { \time 3/8 c'16 @@ -489,7 +489,7 @@ c'8 ~ } - \times 4/5 + \tuplet 5/4 { \time 4/8 c'8 @@ -500,7 +500,7 @@ c'4 c'8 ~ - \times 8/9 + \tuplet 9/8 { \time 4/8 c'8 @@ -545,7 +545,7 @@ \context Voice = "Voice" { \tweak text #tuplet-number::calc-fraction-text - \times 3/4 + \tuplet 4/3 { \time 3/8 c'16 @@ -559,7 +559,7 @@ c'8. ~ \tweak text #tuplet-number::calc-fraction-text - \times 6/7 + \tuplet 7/6 { \time 3/8 c'16 @@ -567,7 +567,7 @@ c'8 ~ } - \times 4/5 + \tuplet 5/4 { \time 4/8 c'8 diff --git a/tests/test_tags.py b/tests/test_tags.py index e62741d..dc37954 100644 --- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -37,7 +37,7 @@ def make_lilypond_file(pairs): \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() - \times 1/1 + \tuplet 1/1 %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() { @@ -74,7 +74,7 @@ def make_lilypond_file(pairs): \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() - \times 1/1 + \tuplet 1/1 %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() { @@ -108,7 +108,7 @@ def make_lilypond_file(pairs): \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 2 } %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() - \times 1/1 + \tuplet 1/1 %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() { @@ -145,7 +145,7 @@ def make_lilypond_file(pairs): \override TupletNumber.text = \markup \scale #'(0.75 . 0.75) \rhythm { 4. } %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() - \times 1/1 + \tuplet 1/1 %! ACCELERANDO_RHYTHM_MAKER %! rmakers.accelerando() { @@ -231,7 +231,7 @@ def make_lilypond_file(pairs): \tweak text #tuplet-number::calc-fraction-text %! INCISED_RHYTHM_MAKER %! rmakers.incised() - \times 16/9 + \tuplet 9/16 %! INCISED_RHYTHM_MAKER %! rmakers.incised() { @@ -250,7 +250,7 @@ def make_lilypond_file(pairs): \tweak text #tuplet-number::calc-fraction-text %! INCISED_RHYTHM_MAKER %! rmakers.incised() - \times 8/5 + \tuplet 5/8 %! INCISED_RHYTHM_MAKER %! rmakers.incised() { @@ -270,7 +270,7 @@ def make_lilypond_file(pairs): \tweak text #tuplet-number::calc-fraction-text %! INCISED_RHYTHM_MAKER %! rmakers.incised() - \times 12/7 + \tuplet 7/12 %! INCISED_RHYTHM_MAKER %! rmakers.incised() { @@ -329,7 +329,7 @@ def make_lilypond_file(pairs): \tweak text #tuplet-number::calc-fraction-text %! TALEA_RHYTHM_MAKER %! rmakers.talea() - \times 1/1 + \tuplet 1/1 %! TALEA_RHYTHM_MAKER %! rmakers.talea() { @@ -354,7 +354,7 @@ def make_lilypond_file(pairs): } %! TALEA_RHYTHM_MAKER %! rmakers.talea() - \times 8/9 + \tuplet 9/8 %! TALEA_RHYTHM_MAKER %! rmakers.talea() { @@ -386,7 +386,7 @@ def make_lilypond_file(pairs): \tweak text #tuplet-number::calc-fraction-text %! TALEA_RHYTHM_MAKER %! rmakers.talea() - \times 1/1 + \tuplet 1/1 %! TALEA_RHYTHM_MAKER %! rmakers.talea() { @@ -405,7 +405,7 @@ def make_lilypond_file(pairs): } %! TALEA_RHYTHM_MAKER %! rmakers.talea() - \times 8/9 + \tuplet 9/8 %! TALEA_RHYTHM_MAKER %! rmakers.talea() {