Skip to content

Commit

Permalink
Cleaned up abjad.Skip("s1 * 2/4").
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorbaca committed Feb 24, 2023
1 parent fdd014b commit 67b5eed
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion abjad/parsers/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -6290,7 +6290,7 @@ def p_simple_element__RESTNAME__optional_notemode_duration(self, p):
rest = _score.Skip(p[2].duration)
if p[2].multiplier is not None:
multiplier = fractions.Fraction(p[2].multiplier)
rest.multiplier = multiplier.pair
rest.multiplier = _duration.pair(multiplier)
p[0] = rest

def p_simple_element__pitch__exclamations__questions__octave_check__optional_notemode_duration__optional_rest(
Expand Down
4 changes: 3 additions & 1 deletion abjad/rhythmtrees.py
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,9 @@ def recurse(node, tuplet_duration):

pulse_duration = _duration.Duration(pulse_duration)
assert 0 < pulse_duration
result = recurse(self, pulse_duration * self.preprolated_duration)
result = recurse(
self, pulse_duration * _duration.Duration(self.preprolated_duration)
)
for component in result[:]:
if isinstance(component, _score.Tuplet):
if component.trivial():
Expand Down
2 changes: 1 addition & 1 deletion docs/source/examples/enumeration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The following functions recreate Malt's results in Abjad:
... lone_note_duration = (1, lone_note_denominator)
... lone_note = abjad.Note("c'", lone_note_duration)
... duration = (outer, lone_note_denominator)
... ratio = inner * [1]
... ratio = inner * (1,)
... maker = abjad.makers.tuplet_from_duration_and_ratio
... inner_tuplet = maker(duration, ratio)
... multiplier = abjad.Fraction(*inner_tuplet.multiplier)
Expand Down

0 comments on commit 67b5eed

Please sign in to comment.