Skip to content

Commit

Permalink
Merge pull request #73 from Abjad/trevor/dev
Browse files Browse the repository at this point in the history 
Merges trevor/dev to change \times to \tuplet
  • Loading branch information
@trevorbaca
trevorbaca authored Jun 14, 2024
2 parents 1741452 + 1523355 commit 8dec05b
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 53 deletions.
72 changes: 48 additions & 24 deletions abjadext/nauert/attackpointoptimizers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,39 +69,45 @@ class MeasurewiseAttackPointOptimizer(AttackPointOptimizer):
c'16..
d'64
~
\times 4/5 {
\tuplet 5/4
{
d'8
e'32
~
}
\times 4/7 {
\tuplet 7/4
{
e'8
~
e'32
f'16
~
}
\times 4/5 {
\tuplet 5/4
{
f'16.
g'16
~
}
g'16
a'16
~
\times 4/5 {
\tuplet 5/4
{
a'16
b'16.
~
}
\times 4/7 {
\tuplet 7/4
{
b'16
c''8
~
c''32
~
}
\times 4/5 {
\tuplet 5/4
{
c''32
r32
r32
Expand Down Expand Up @@ -135,43 +141,49 @@ class MeasurewiseAttackPointOptimizer(AttackPointOptimizer):
c'16..
d'64
~
\times 4/5 {
\tuplet 5/4
{
d'16.
~
d'32
e'32
~
}
\times 4/7 {
\tuplet 7/4
{
e'16.
~
e'16
f'16
~
}
\times 4/5 {
\tuplet 5/4
{
f'16.
g'16
~
}
g'16
a'16
~
\times 4/5 {
\tuplet 5/4
{
a'16
b'32
~
b'16
~
}
\times 4/7 {
\tuplet 7/4
{
b'16
c''32
~
c''8
~
}
\times 4/5 {
\tuplet 5/4
{
c''32
r16
r16
Expand Down Expand Up @@ -273,39 +285,45 @@ class NaiveAttackPointOptimizer(AttackPointOptimizer):
c'16..
d'64
~
\times 4/5 {
\tuplet 5/4
{
d'8
e'32
~
}
\times 4/7 {
\tuplet 7/4
{
e'8
~
e'32
f'16
~
}
\times 4/5 {
\tuplet 5/4
{
f'16.
g'16
~
}
g'16
a'16
~
\times 4/5 {
\tuplet 5/4
{
a'16
b'16.
~
}
\times 4/7 {
\tuplet 7/4
{
b'16
c''8
~
c''32
~
}
\times 4/5 {
\tuplet 5/4
{
c''32
r32
r32
Expand Down Expand Up @@ -397,7 +415,8 @@ class NullAttackPointOptimizer(AttackPointOptimizer):
c'64
d'64
~
\times 4/5 {
\tuplet 5/4
{
d'32
~
d'32
Expand All @@ -408,7 +427,8 @@ class NullAttackPointOptimizer(AttackPointOptimizer):
e'32
~
}
\times 4/7 {
\tuplet 7/4
{
e'32
~
e'32
Expand All @@ -423,7 +443,8 @@ class NullAttackPointOptimizer(AttackPointOptimizer):
f'32
~
}
\times 4/5 {
\tuplet 5/4
{
f'32
~
f'32
Expand All @@ -437,7 +458,8 @@ class NullAttackPointOptimizer(AttackPointOptimizer):
g'16
a'16
~
\times 4/5 {
\tuplet 5/4
{
a'32
~
a'32
Expand All @@ -448,7 +470,8 @@ class NullAttackPointOptimizer(AttackPointOptimizer):
b'32
~
}
\times 4/7 {
\tuplet 7/4
{
b'32
~
b'32
Expand All @@ -463,7 +486,8 @@ class NullAttackPointOptimizer(AttackPointOptimizer):
c''32
~
}
\times 4/5 {
\tuplet 5/4
{
c''32
r32
r32
Expand Down
18 changes: 9 additions & 9 deletions abjadext/nauert/quantizer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,31 +106,31 @@ def quantize(
\time 2/4
c'4
~
\times 4/5 {
\tuplet 5/4 {
c'16.
cs'8..
~
}
}
{
\times 4/7 {
\tuplet 7/4 {
\tempo 8=57
\time 5/4
cs'16.
d'8
~
}
\times 4/5 {
\tuplet 5/4 {
d'16
ef'16.
~
}
\times 2/3 {
\tuplet 3/2 {
ef'16
e'8
~
}
\times 4/7 {
\tuplet 7/4 {
e'16
f'8
~
Expand All @@ -140,12 +140,12 @@ def quantize(
f'32
fs'16.
~
\times 4/5 {
\tuplet 5/4 {
fs'32
g'8
~
}
\times 4/7 {
\tuplet 7/4 {
g'32
r32
r16
Expand Down Expand Up @@ -206,7 +206,7 @@ def quantize(
~
e'16
~
\times 2/3 {
\tuplet 3/2 {
\tempo 4=30
e'32
f'8.
Expand All @@ -215,7 +215,7 @@ def quantize(
fs'32
~
}
\times 2/3 {
\tuplet 3/2 {
fs'32
g'8.
r32
Expand Down
54 changes: 54 additions & 0 deletions tests/test_MeasurewiseAttackPointOptimizer___call__.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import abjad
from abjadext import nauert


def test_MeasurewiseAttackPointOptimizer___call___01():
string = r"""
\tuplet 11/8
{
a''8
~
a''8
~
a''8
~
a''8
~
a''8
~
a''8
~
a''8
\grace {
e''16
e''16
}
d''8
~
d''8
r8
r8
}
"""
string = abjad.string.normalize(string)
container = abjad.Container(string)
time_signature = abjad.TimeSignature((4, 4))
attack_point_optimizer = nauert.MeasurewiseAttackPointOptimizer()
attack_point_optimizer(container, time_signature)
string = abjad.lilypond(container)
assert string == abjad.string.normalize(
r"""
{
\tuplet 11/8
{
a''2..
\grace {
e''16
e''16
}
d''4
r4
}
}
"""
), print(string)
6 changes: 3 additions & 3 deletions tests/test_QGrid___call__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ def test_QGrid___call___02():
assert isinstance(result, list) and len(result) == 1
assert abjad.lilypond(result[0]) == abjad.string.normalize(
r"""
\times 2/3
\tuplet 3/2
{
c'8
c'16
c'16
\times 2/3
\tuplet 3/2
{
c'16
c'16
Expand Down Expand Up @@ -132,7 +132,7 @@ def test_QGrid___call___03():
assert abjad.lilypond(result[0]) == abjad.string.normalize(
r"""
\tweak edge-height #'(0.7 . 0)
\times 2/3
\tuplet 3/2
{
c'4
c'4
Expand Down
Loading

0 comments on commit 8dec05b

Please sign in to comment.