diff options
| author | David Kastrup <dak@gnu.org> | 2013-01-24 13:46:43 +0100 |
|---|---|---|
| committer | David Kastrup <dak@gnu.org> | 2013-01-25 21:22:07 +0100 |
| commit | fbe8b9bf789f4a9833e1581dbb6ba4fce71a6cd2 (patch) | |
| tree | af244160c03a6cb0a510a5e32e05bedb57459d73 | |
| parent | 6f1f57822ea1fcef007fff4458a31ab0dbd30898 (diff) | |
Run scripts/auxiliar/update-with-convert-ly.sh
167 files changed, 782 insertions, 782 deletions
diff --git a/Documentation/cs/learning/common-notation.itely b/Documentation/cs/learning/common-notation.itely index e60566d22b..aefd911aa1 100644 --- a/Documentation/cs/learning/common-notation.itely +++ b/Documentation/cs/learning/common-notation.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @ignore Tutorial guidelines: @@ -525,10 +525,10 @@ V jedné triole trvajà noty 2/3 jejich zapsané délky, takže triola má 2/3 jako svůj zlomek: @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @subheading Ozdoby @@ -1343,7 +1343,7 @@ v souboru vytvoÅ™ily novou promÄ›nnou. TÃm se dá pÃsemná práce ulehÄit, když se skupiny not Äasto opakujÃ. @lilypond[verbatim,quote] -tripletA = \times 2/3 { c,8 e g } +tripletA = \tuplet 3/2 { c,8 e g } barA = { \tripletA \tripletA \tripletA \tripletA } \relative c'' { diff --git a/Documentation/cs/learning/fundamental.itely b/Documentation/cs/learning/fundamental.itely index 3131a99e4a..c4c5e6eeb5 100644 --- a/Documentation/cs/learning/fundamental.itely +++ b/Documentation/cs/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Pavel Fric @node Základnà pojmy @@ -619,10 +619,10 @@ oblouÄek, který zaÄÃná u trioly (řádky 3 a 4). @lilypond[quote,verbatim,ragged-right] { -r16[ g \times 2/3 { r16 e'8] } -g16( a \times 2/3 { b16 d) e' } -g8[( a \times 2/3 { b8 d') e'~] } | -\times 4/5 { e'32\( a b d' e' } a'4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g16( a \tuplet 3/2 { b16 d) e' } +g8[( a \tuplet 3/2 { b8 d') e'~] } | +\tuplet 5/4 { e'32\( a b d' e' } a'4.\) } @end lilypond diff --git a/Documentation/cs/learning/tweaks.itely b/Documentation/cs/learning/tweaks.itely index 4f535f9716..18c9bae587 100644 --- a/Documentation/cs/learning/tweaks.itely +++ b/Documentation/cs/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node LadÄ›nà výstupu @chapter LadÄ›nà výstupu @@ -465,11 +465,11 @@ gesetzt wird. @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -487,14 +487,14 @@ beginnen, kann ihr Aussehen auf die übliche Art mit dem @c NOTE Tuplet brackets collide if notes are high on staff @c See issue 509 @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/cs/usage/lilypond-book.itely b/Documentation/cs/usage/lilypond-book.itely index ae2b89ad6f..d041f61620 100644 --- a/Documentation/cs/usage/lilypond-book.itely +++ b/Documentation/cs/usage/lilypond-book.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Pavel Fric @@ -95,7 +95,7 @@ kombinieren. Zum Beispiel: \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -155,7 +155,7 @@ kombinieren. Zum Beispiel: @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/Documentation/de/essay/engraving.itely b/Documentation/de/essay/engraving.itely index ee837333e3..35a84e563f 100644 --- a/Documentation/de/essay/engraving.itely +++ b/Documentation/de/essay/engraving.itely @@ -9,7 +9,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -1154,14 +1154,14 @@ Beispiel heranzieht: \new Voice = "I" \relative c''' { \time 3/4 \voiceOne - \times 6/7 { g8 g g g g g g } + \tuplet 7/6 { g8 g g g g g g } \oneVoice r4 <b,, fis' g bes> r4\fermata } \new Voice = "II" \relative c' { \voiceTwo c4 - \times 4/5 { + \tuplet 5/4 { <c ees>8 f g \change Staff = "LH" \oneVoice \stemUp g,( c} @@ -1615,7 +1615,7 @@ nächste Beispiel zeigt einige etwas exotischere Konstruktionen: \set followVoice = ##t c'''32([ b''16 a''16 gis''16 g''32)] } \\ { - s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] + s4 \tuplet 3/2 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ { diff --git a/Documentation/de/learning/common-notation.itely b/Documentation/de/learning/common-notation.itely index 2f9e10c1ea..a9ad8b0859 100644 --- a/Documentation/de/learning/common-notation.itely +++ b/Documentation/de/learning/common-notation.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @ignore Tutorial guidelines: @@ -534,10 +534,10 @@ In einer Triole dauern die Noten 2/3 ihrer normalen Länge, also hat eine Triole 2/3 als Bruch: @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @subheading Verzierungen @@ -1340,7 +1340,7 @@ werden, wenn Notengruppen sich oft wiederholen. @c KEEP LY @lilypond[verbatim,quote] -trioleA = \times 2/3 { c,8 e g } +trioleA = \tuplet 3/2 { c,8 e g } TaktA = { \trioleA \trioleA \trioleA \trioleA } \relative c'' { diff --git a/Documentation/de/learning/fundamental.itely b/Documentation/de/learning/fundamental.itely index cb78a439d2..f53b326965 100644 --- a/Documentation/de/learning/fundamental.itely +++ b/Documentation/de/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala, Reinhold Kainhofer @node Grundbegriffe @@ -626,10 +626,10 @@ Phrasierungsbogen, der in einer Triole beginnt (Zeilen 3 und 4). @lilypond[quote,verbatim,ragged-right] { -r16[ g \times 2/3 { r16 e'8] } -g16( a \times 2/3 { b16 d) e' } -g8[( a \times 2/3 { b8 d') e'~] } | -\times 4/5 { e'32\( a b d' e' } a'4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g16( a \tuplet 3/2 { b16 d) e' } +g8[( a \tuplet 3/2 { b8 d') e'~] } | +\tuplet 5/4 { e'32\( a b d' e' } a'4.\) } @end lilypond diff --git a/Documentation/de/learning/tweaks.itely b/Documentation/de/learning/tweaks.itely index 79985b0709..2ee7f5a46d 100644 --- a/Documentation/de/learning/tweaks.itely +++ b/Documentation/de/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Die Ausgabe verändern @chapter Die Ausgabe verändern @@ -488,11 +488,11 @@ gesetzt wird. @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -510,14 +510,14 @@ beginnen, kann ihr Aussehen auf die übliche Art mit dem @c NOTE Tuplet brackets collide if notes are high on staff @c See issue 509 @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/de/notation/ancient.itely b/Documentation/de/notation/ancient.itely index db9d2f83eb..09edea0c02 100644 --- a/Documentation/de/notation/ancient.itely +++ b/Documentation/de/notation/ancient.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -2908,9 +2908,9 @@ werden. spiritus = \relative c' { \time 1/4 \override Lyrics.LyricText.X-extent = #'(0 . 3) - d4 \times 2/3 { f8 a g } g a a4 g f8 e + d4 \tuplet 3/2 { f8 a g } g a a4 g f8 e d4 f8 g g8 d f g a g f4 g8 a a4 s - \times 2/3 { g8 f d } e f g a g4 + \tuplet 3/2 { g8 f d } e f g a g4 } spirLyr = \lyricmode { diff --git a/Documentation/de/notation/cheatsheet.itely b/Documentation/de/notation/cheatsheet.itely index e856fef9bb..ebedb6c218 100644 --- a/Documentation/de/notation/cheatsheet.itely +++ b/Documentation/de/notation/cheatsheet.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -230,12 +230,12 @@ f8 c2 d e @end lilypond -@item @code{\times 2/3 @{f g a@}} +@item @code{\tuplet 3/2 @{f g a@}} @tab Triolen @tab @lilypond[relative=1] \set Staff.implicitTimeSignatureVisibility = #all-invisible -\times 2/3 { f8 g a } +\tuplet 3/2 { f8 g a } @end lilypond diff --git a/Documentation/de/notation/fretted-strings.itely b/Documentation/de/notation/fretted-strings.itely index dba244d010..6580c77bc9 100644 --- a/Documentation/de/notation/fretted-strings.itely +++ b/Documentation/de/notation/fretted-strings.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -1766,7 +1766,7 @@ music = \relative c' { < b\3 \deadNote d\2 b'\1 > < c\3 \deadNote e\2 c'\1 > \deadNotesOn - \times 2/3 { g8 b e } + \tuplet 3/2 { g8 b e } \deadNotesOff < a,\3 c\2 e\1 >1 } diff --git a/Documentation/de/notation/repeats.itely b/Documentation/de/notation/repeats.itely index 5195578fb9..020cbc5fd6 100644 --- a/Documentation/de/notation/repeats.itely +++ b/Documentation/de/notation/repeats.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Till Paala @@ -671,7 +671,7 @@ benützten ein doppeltes Prozent-Symbol. @lilypond[verbatim,quote,relative=2] \repeat percent 4 { c8. <d f>16 } -\repeat percent 2 { \times 2/3 { r8 c d } e4 } +\repeat percent 2 { \tuplet 3/2 { r8 c d } e4 } @end lilypond @snippets diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely index 9efc3fac99..355f66a158 100644 --- a/Documentation/de/notation/rhythms.itely +++ b/Documentation/de/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -221,8 +221,8 @@ Triole, in welcher drei Noten die Länge von zwei haben, der Wert jeder einzelnen Note ist also 2/3 der notierten Länge. @lilypond[quote,verbatim,relative=2] -a2 \times 2/3 { b4 b b } -c4 c \times 2/3 { b4 a g } +a2 \tuplet 3/2 { b4 b b } +c4 c \tuplet 3/2 { b4 a g } @end lilypond @cindex Triolenklammer, Platzierung @@ -242,7 +242,7 @@ N-tolen können ineinander geschachtelt werden: @lilypond[quote,verbatim,relative=2] \autoBeamOff -c4 \times 4/5 { f8 e f \times 2/3 { e[ f g] } } f4 +c4 \tuplet 5/4 { f8 e f \tuplet 3/2 { e[ f g] } } f4 @end lilypond Wenn man die Eigenschaften von N-tolen verändern will, die zum @@ -1676,7 +1676,7 @@ auswirkt. \scaleDurations 3/5 { \repeat unfold 2 { c8[ c c] } \repeat unfold 2 { c8[ c] } | - c4. c4. \times 2/3 { c8[ c c] } c4 + c4. c4. \tuplet 3/2 { c8[ c c] } c4 } } >> diff --git a/Documentation/de/notation/spacing.itely b/Documentation/de/notation/spacing.itely index a38be05c32..9ce951b8a7 100644 --- a/Documentation/de/notation/spacing.itely +++ b/Documentation/de/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -1401,7 +1401,7 @@ müssen. \remove "Forbid_line_break_engraver" } \relative c'' { << - { c2. \times 2/3 { c4 c c } c2. | } + { c2. \tuplet 3/2 { c4 c c } c2. | } { s1 | \break s1 | } >> } @@ -3064,14 +3064,14 @@ werden: \score { << \new Staff { - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } c8 c8 c8 c8 } \new Staff { c8 c8 c8 c8 - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } } @@ -3196,7 +3196,7 @@ die klassischen Abstände und Flattersatz (ragged-right) eingesetzt werden: \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3227,7 +3227,7 @@ eingeschaltet: \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3273,7 +3273,7 @@ erscheinen, größere Referenzdauern zwingen sie dichter zusammen. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3291,7 +3291,7 @@ erscheinen, größere Referenzdauern zwingen sie dichter zusammen. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3309,7 +3309,7 @@ erscheinen, größere Referenzdauern zwingen sie dichter zusammen. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3342,12 +3342,12 @@ System mit anderen rhythmischen Werten hinzugefügt wird: \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3368,12 +3368,12 @@ dieser Situation deutlich: \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3398,12 +3398,12 @@ sollte auch noch die gleichmäßige Dehnung (@code{uniform-stretching}) angescha \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } diff --git a/Documentation/de/notation/vocal.itely b/Documentation/de/notation/vocal.itely index afab5fc62b..8ac7d3e17a 100644 --- a/Documentation/de/notation/vocal.itely +++ b/Documentation/de/notation/vocal.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -1925,7 +1925,7 @@ unterschiedlichen Melodien auszurichten. Das wird mit der << \new Voice = "alternative" { \voiceOne - \times 2/3 { + \tuplet 3/2 { % show associations clearly. \override NoteColumn.force-hshift = #-3 f8 f g diff --git a/Documentation/de/usage/lilypond-book.itely b/Documentation/de/usage/lilypond-book.itely index 829379030d..02ad688826 100644 --- a/Documentation/de/usage/lilypond-book.itely +++ b/Documentation/de/usage/lilypond-book.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Reinhold Kainhofer @c Translation checkers: Till Paala @@ -96,7 +96,7 @@ kombinieren. Zum Beispiel: \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -157,7 +157,7 @@ kombinieren. Zum Beispiel: @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/Documentation/es/essay/engraving.itely b/Documentation/es/essay/engraving.itely index 771b9e49c6..67482495eb 100644 --- a/Documentation/es/essay/engraving.itely +++ b/Documentation/es/essay/engraving.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Grabado musical @chapter Grabado musical @@ -1162,14 +1162,14 @@ aparente si tenemos en cuenta un ejemplo musical más complejo: \new Voice = "I" \relative c''' { \time 3/4 \voiceOne - \times 6/7 { g8 g g g g g g } + \tuplet 7/6 { g8 g g g g g g } \oneVoice r4 <b,, fis' g bes> r4\fermata } \new Voice = "II" \relative c' { \voiceTwo c4 - \times 4/5 { + \tuplet 5/4 { <c ees>8 f g \change Staff = "LH" \oneVoice \stemUp g,( c} @@ -1625,7 +1625,7 @@ ejemplo siguiente combina unas pocas construcciones algo más exóticas. \set followVoice = ##t c'''32([ b''16 a''16 gis''16 g''32)] } \\ { - s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] + s4 \tuplet 3/2 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ { diff --git a/Documentation/es/learning/common-notation.itely b/Documentation/es/learning/common-notation.itely index 362c01056a..da2e5beafa 100644 --- a/Documentation/es/learning/common-notation.itely +++ b/Documentation/es/learning/common-notation.itely @@ -7,7 +7,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @ignore Tutorial guidelines: (different from policy.txt!) @@ -553,10 +553,10 @@ fracción. Los tresillos hacen que las notas ocupen 2/3 de su duración expresa, por tanto un @notation{tresillo} lleva una fracción de 2/3: @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @subheading Notas de adorno @@ -1332,7 +1332,7 @@ para acortar el código si una sección musical se repite muchas veces. @c KEEP LY @lilypond[verbatim,quote,ragged-right] -tresilloA = \times 2/3 { c,8 e g } +tresilloA = \tuplet 3/2 { c,8 e g } compasA = { \tresilloA \tresilloA \tresilloA \tresilloA } \relative c'' { diff --git a/Documentation/es/learning/fundamental.itely b/Documentation/es/learning/fundamental.itely index a4ae78c2fc..e49d9f1522 100644 --- a/Documentation/es/learning/fundamental.itely +++ b/Documentation/es/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Conceptos fundamentales @@ -574,10 +574,10 @@ unión que atraviesa dos grupos especiales, y una ligadura de fraseo que sale del interior de un grupo especial (lÃneas 3 y 4). @lilypond[quote,verbatim,ragged-right,relative=1] -r16[ g \times 2/3 { r16 e'8] } -g,16( a \times 2/3 { b16 d) e } -g,8[( a \times 2/3 { b8 d) e~] } | -\times 4/5 { e32\( a, b d e } a4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g,16( a \tuplet 3/2 { b16 d) e } +g,8[( a \tuplet 3/2 { b8 d) e~] } | +\tuplet 5/4 { e32\( a, b d e } a4.\) @end lilypond diff --git a/Documentation/es/learning/tweaks.itely b/Documentation/es/learning/tweaks.itely index fd03a7f7e7..18a254ca4e 100644 --- a/Documentation/es/learning/tweaks.itely +++ b/Documentation/es/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Trucar la salida @chapter Trucar la salida @@ -509,11 +509,11 @@ tresillo corto. @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -527,14 +527,14 @@ se puede modificar de la forma usual mediante instrucciones @cindex TupletNumber, ejemplo de sobreescritura @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/es/notation/ancient.itely b/Documentation/es/notation/ancient.itely index 4ad02d5ce6..17b8451044 100644 --- a/Documentation/es/notation/ancient.itely +++ b/Documentation/es/notation/ancient.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Notación antigua @@ -2836,9 +2836,9 @@ más ajustes posteriormente, esto se puede hacer fácilmente con spiritus = \relative c' { \time 1/4 \override Lyrics.LyricText.X-extent = #'(0 . 3) - d4 \times 2/3 { f8 a g } g a a4 g f8 e + d4 \tuplet 3/2 { f8 a g } g a a4 g f8 e d4 f8 g g8 d f g a g f4 g8 a a4 s - \times 2/3 { g8 f d } e f g a g4 + \tuplet 3/2 { g8 f d } e f g a g4 } spirLyr = \lyricmode { diff --git a/Documentation/es/notation/cheatsheet.itely b/Documentation/es/notation/cheatsheet.itely index e0d0703841..25013338c1 100644 --- a/Documentation/es/notation/cheatsheet.itely +++ b/Documentation/es/notation/cheatsheet.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c TODO: add tablature. @@ -228,12 +228,12 @@ f8 c2 d e @end lilypond -@item @code{\times 2/3 @{f g a@}} +@item @code{\tuplet 3/2 @{f g a@}} @tab tresillos @tab @lilypond[relative=1] \set Staff.implicitTimeSignatureVisibility = #all-invisible -\times 2/3 { f8 g a } +\tuplet 3/2 { f8 g a } @end lilypond diff --git a/Documentation/es/notation/fretted-strings.itely b/Documentation/es/notation/fretted-strings.itely index 71a2be2061..b57661b52c 100644 --- a/Documentation/es/notation/fretted-strings.itely +++ b/Documentation/es/notation/fretted-strings.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Instrumentos de cuerda con trastes @section Instrumentos de cuerda con trastes @@ -1765,7 +1765,7 @@ music = \relative c' { < b\3 \deadNote d\2 b'\1 > < c\3 \deadNote e\2 c'\1 > \deadNotesOn - \times 2/3 { g8 b e } + \tuplet 3/2 { g8 b e } \deadNotesOff < a,\3 c\2 e\1 >1 } diff --git a/Documentation/es/notation/repeats.itely b/Documentation/es/notation/repeats.itely index c93e9d6ee6..2024ad458e 100644 --- a/Documentation/es/notation/repeats.itely +++ b/Documentation/es/notation/repeats.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @node Repeticiones @section Repeticiones @@ -703,7 +703,7 @@ duraciones mezcladas utilizan un sÃmbolo de porcentaje doble. @lilypond[verbatim,quote,relative=2] \repeat percent 4 { c8. <d f>16 } -\repeat percent 2 { \times 2/3 { r8 c d } e4 } +\repeat percent 2 { \tuplet 3/2 { r8 c d } e4 } @end lilypond @snippets diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely index 40bc487a9a..b235489e12 100644 --- a/Documentation/es/notation/rhythms.itely +++ b/Documentation/es/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Duraciones @section Duraciones @@ -214,8 +214,8 @@ que 3 notas tienen el valor de 2, por tanto las notas duran 2/3 de su valor escrito: @lilypond[quote,verbatim,relative=2] -a2 \times 2/3 { b4 b b } -c4 c \times 2/3 { b4 a g } +a2 \tuplet 3/2 { b4 b b } +c4 c \tuplet 3/2 { b4 a g } @end lilypond @cindex grupos de valoración especial, colocación del corchete @@ -234,7 +234,7 @@ Los grupos pueden anidarse unos dentro de otros: @lilypond[quote,verbatim,relative=2] \autoBeamOff -c4 \times 4/5 { f8 e f \times 2/3 { e[ f g] } } f4 +c4 \tuplet 5/4 { f8 e f \tuplet 3/2 { e[ f g] } } f4 @end lilypond La modificación de los grupos especiales anidados que comienzan en el @@ -1687,7 +1687,7 @@ de barrado automático. \scaleDurations 3/5 { \repeat unfold 2 { c8[ c c] } \repeat unfold 2 { c8[ c] } | - c4. c \times 2/3 { c8[ c c] } c4 + c4. c \tuplet 3/2 { c8[ c c] } c4 } } >> diff --git a/Documentation/es/notation/spacing.itely b/Documentation/es/notation/spacing.itely index dd691efea5..62ca280890 100644 --- a/Documentation/es/notation/spacing.itely +++ b/Documentation/es/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @ignore GDP TODO list @@ -1499,7 +1499,7 @@ paralelo con la música: \remove "Forbid_line_break_engraver" } \relative c'' { << - { c2. \times 2/3 { c4 c c } c2. | } + { c2. \tuplet 3/2 { c4 c c } c2. | } { s1 | \break s1 | } >> } @@ -3103,14 +3103,14 @@ puede cambiarse al principio de la partitura: \score { << \new Staff { - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } c8 c8 c8 c8 } \new Staff { c8 c8 c8 c8 - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } } @@ -3230,7 +3230,7 @@ espaciado clásico sin justificación por la derecha. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3260,7 +3260,7 @@ ajuste @code{proportionalNotationDuration}. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3312,7 +3312,7 @@ más largas aplican un espaciado más apretado. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3330,7 +3330,7 @@ más largas aplican un espaciado más apretado. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3348,7 +3348,7 @@ más largas aplican un espaciado más apretado. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3383,12 +3383,12 @@ diferente de grupo especial. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3409,12 +3409,12 @@ soluciona. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3440,12 +3440,12 @@ propiedad de @code{SpacingSpanner}. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } diff --git a/Documentation/es/notation/vocal.itely b/Documentation/es/notation/vocal.itely index 2878f472f1..95e8fc6e52 100644 --- a/Documentation/es/notation/vocal.itely +++ b/Documentation/es/notation/vocal.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Música vocal @section Música vocal @@ -1915,7 +1915,7 @@ propiedad @code{associatedVoice}: << \new Voice = "alternative" { \voiceOne - \times 2/3 { + \tuplet 3/2 { % show associations clearly. \override NoteColumn.force-hshift = #-3 f8 f g diff --git a/Documentation/es/usage/lilypond-book.itely b/Documentation/es/usage/lilypond-book.itely index d483d6f0ef..f99fe8c605 100644 --- a/Documentation/es/usage/lilypond-book.itely +++ b/Documentation/es/usage/lilypond-book.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Note: keep this node named so that `info lilypond-book' brings you here. @node lilypond-book @@ -92,7 +92,7 @@ música y texto. Por ejemplo: \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -154,7 +154,7 @@ música y texto. Por ejemplo: @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely index 8c0a3f6941..f32934303c 100644 --- a/Documentation/essay/engraving.itely +++ b/Documentation/essay/engraving.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Music engraving @chapter Music engraving @@ -1087,14 +1087,14 @@ consider a more complicated musical example: \new Voice = "I" \relative c''' { \time 3/4 \voiceOne - \times 6/7 { g8 g g g g g g } + \tuplet 7/6 { g8 g g g g g g } \oneVoice r4 <b,, fis' g bes> r4\fermata } \new Voice = "II" \relative c' { \voiceTwo c4 - \times 4/5 { + \tuplet 5/4 { <c ees>8 f g \change Staff = "LH" \oneVoice \stemUp g,( c} @@ -1525,7 +1525,7 @@ following example combines some more exotic constructs. \set followVoice = ##t c'''32([ b''16 a''16 gis''16 g''32)] } \\ { - s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] + s4 \tuplet 3/2 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ { diff --git a/Documentation/fr/essay/engraving.itely b/Documentation/fr/essay/engraving.itely index 5a500b6bbd..85b91038d8 100644 --- a/Documentation/fr/essay/engraving.itely +++ b/Documentation/fr/essay/engraving.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Jean-Charles Malahieude, John Mandereau, Gauvain Pocentek @@ -1171,14 +1171,14 @@ musique se complique : \new Voice = "I" \relative c''' { \time 3/4 \voiceOne - \times 6/7 {g8 g g g g g g} + \tuplet 7/6 {g8 g g g g g g} \oneVoice r4 <b,, fis' g bes> r4\fermata } \new Voice = "II" \relative c' { \voiceTwo c4 - \times 4/5 { + \tuplet 5/4 { <c ees>8 f g \change Staff = "LH" \oneVoice \stemUp g,( c} @@ -1631,7 +1631,7 @@ constructions@dots{} \set followVoice = ##t c'''32([ b''16 a''16 gis''16 g''32)] } \\ { - s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] + s4 \tuplet 3/2 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ { diff --git a/Documentation/fr/learning/common-notation.itely b/Documentation/fr/learning/common-notation.itely index e695fc892f..7bd96e5c1b 100644 --- a/Documentation/fr/learning/common-notation.itely +++ b/Documentation/fr/learning/common-notation.itely @@ -26,7 +26,7 @@ Tutorial guidelines: (different from policy.txt!) @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Nicolas Grandclaude, Ludovic Sardain, Gauvain Pocentek @c Translation checkers: Jean-Charles Malahieude, Valentin Villenave, John Mandereau @@ -566,10 +566,10 @@ deux tiers de la durée de leur notation réelle, cette fraction est donc de 2/3 pour les triolets : @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @@ -1332,7 +1332,7 @@ exemple, cela peut servir à saisir un motif qu'une seule fois, même s'il se répète un grand nombre de fois dans la pièce. @lilypond[verbatim,quote] -tripletA = \times 2/3 { c,8 e g } +tripletA = \tuplet 3/2 { c,8 e g } barA = { \tripletA \tripletA \tripletA \tripletA } \relative c'' { diff --git a/Documentation/fr/learning/fundamental.itely b/Documentation/fr/learning/fundamental.itely index 7c9870d739..c1db7aa960 100644 --- a/Documentation/fr/learning/fundamental.itely +++ b/Documentation/fr/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: John Mandereau @@ -559,10 +559,10 @@ qui s'étendent sur un triolet, lui-même lié à un quintolet agrémenté d'une liaison de phrasé se poursuivant (lignes 3 et 4). @lilypond[quote,verbatim,ragged-right,relative=1] -r16[ g \times 2/3 { r16 e'8] } -g,16( a \times 2/3 { b16 d) e } -g,8[( a \times 2/3 { b8 d) e~] } | -\times 4/5 { e32\( a, b d e } a4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g,16( a \tuplet 3/2 { b16 d) e } +g,8[( a \tuplet 3/2 { b8 d) e~] } | +\tuplet 5/4 { e32\( a, b d e } a4.\) @end lilypond diff --git a/Documentation/fr/learning/tweaks.itely b/Documentation/fr/learning/tweaks.itely index c31b144a16..bba10d1c2c 100644 --- a/Documentation/fr/learning/tweaks.itely +++ b/Documentation/fr/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Valentin Villenave, Nicolas Klutchnikoff, Damien Heurtebise @c Translation checkers: Jean-Charles Malahieude, John Mandereau @@ -514,11 +514,11 @@ crochet de triolet court. @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -532,14 +532,14 @@ avec la commande @code{\override} : @cindex TupletNumber, exemple de dérogation @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/fr/notation/ancient.itely b/Documentation/fr/notation/ancient.itely index a4c562d62f..98488cd668 100644 --- a/Documentation/fr/notation/ancient.itely +++ b/Documentation/fr/notation/ancient.itely @@ -9,7 +9,7 @@ @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Jean-Charles Malahieude @@ -2846,9 +2846,9 @@ peuvent se réaliser avec des @qq{notes silencieuses} (@code{s}). spiritus = \relative c' { \time 1/4 \override Lyrics.LyricText.X-extent = #'(0 . 3) - d4 \times 2/3 { f8 a g } g a a4 g f8 e + d4 \tuplet 3/2 { f8 a g } g a a4 g f8 e d4 f8 g g8 d f g a g f4 g8 a a4 s - \times 2/3 { g8 f d } e f g a g4 + \tuplet 3/2 { g8 f d } e f g a g4 } spirLyr = \lyricmode { diff --git a/Documentation/fr/notation/cheatsheet.itely b/Documentation/fr/notation/cheatsheet.itely index 344dd0f6ef..6df0134f1a 100644 --- a/Documentation/fr/notation/cheatsheet.itely +++ b/Documentation/fr/notation/cheatsheet.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Valentin Villenave @c Translation checkers: Jean-Charles Malahieude @@ -230,12 +230,12 @@ f8 c2 d e @end lilypond -@item @code{\times 2/3 @{f g a@}} +@item @code{\tuplet 3/2 @{f g a@}} @tab triolets @tab @lilypond[relative=1] \set Staff.implicitTimeSignatureVisibility = #all-invisible -\times 2/3 { f8 g a } +\tuplet 3/2 { f8 g a } @end lilypond diff --git a/Documentation/fr/notation/fretted-strings.itely b/Documentation/fr/notation/fretted-strings.itely index 0dc8fed745..9aaf2b6bb7 100644 --- a/Documentation/fr/notation/fretted-strings.itely +++ b/Documentation/fr/notation/fretted-strings.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Matthieu Jacquot @c Translation checkers: Jean-Charles Malahieude @@ -1723,7 +1723,7 @@ music = \relative c' { < b\3 \deadNote d\2 b'\1 > < c\3 \deadNote e\2 c'\1 > \deadNotesOn - \times 2/3 { g8 b e } + \tuplet 3/2 { g8 b e } \deadNotesOff < a,\3 c\2 e\1 >1 } diff --git a/Documentation/fr/notation/repeats.itely b/Documentation/fr/notation/repeats.itely index a1d9b2f7f4..2f27c3bf69 100644 --- a/Documentation/fr/notation/repeats.itely +++ b/Documentation/fr/notation/repeats.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Jean-Charles Malahieude, John Mandereau @@ -659,7 +659,7 @@ différentes sont remplacées par un double symbole de pourcentage. @lilypond[verbatim,quote,relative=2] \repeat percent 4 { c8. <d f>16 } -\repeat percent 2 { \times 2/3 { r8 c d } e4 } +\repeat percent 2 { \tuplet 3/2 { r8 c d } e4 } @end lilypond @snippets diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely index cfaaba6626..e9596fbea0 100644 --- a/Documentation/fr/notation/rhythms.itely +++ b/Documentation/fr/notation/rhythms.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Frédéric Chiasson, Jean-Charles Malahieude @c Translation checkers: Valentin Villenave, François Martin, Xavier Scheuer @@ -218,8 +218,8 @@ est le triolet, dans lequel trois notes ont la durée de deux, et où les notes durent donc deux tiers de leur valeur écrite. @lilypond[quote,verbatim,relative=2] -a2 \times 2/3 { b4 b b } -c4 c \times 2/3 { b4 a g } +a2 \tuplet 3/2 { b4 b b } +c4 c \tuplet 3/2 { b4 a g } @end lilypond @cindex crochet de nolet, positionnement @@ -240,7 +240,7 @@ Les nolets peuvent être imbriqués ; par exemple, @lilypond[quote,verbatim,relative=2] \autoBeamOff -c4 \times 4/5 { f8 e f \times 2/3 { e[ f g] } } f4 | +c4 \tuplet 5/4 { f8 e f \tuplet 3/2 { e[ f g] } } f4 | @end lilypond Lorsque, dans une imbrication, les nolets débutent au même instant, il @@ -1679,7 +1679,7 @@ les règles de ligature automatique. \scaleDurations 3/5 { \repeat unfold 2 { c8[ c c] } \repeat unfold 2 { c8[ c] } | - c4. c \times 2/3 { c8[ c c] } c4 + c4. c \tuplet 3/2 { c8[ c c] } c4 } } >> diff --git a/Documentation/fr/notation/spacing.itely b/Documentation/fr/notation/spacing.itely index 061b81fa52..fec8c15a0c 100644 --- a/Documentation/fr/notation/spacing.itely +++ b/Documentation/fr/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Frédéric Chiasson, Jean-Charles Malahieude @@ -1505,7 +1505,7 @@ forcés doivent être saisis au sein d'une expression polyphonique : \remove "Forbid_line_break_engraver" } \relative c'' { << - { c2. \times 2/3 { c4 c c } c2. | } + { c2. \tuplet 3/2 { c4 c c } c2. | } { s1 | \break s1 | } >> } @@ -3117,14 +3117,14 @@ s'appliquera à toute la partition, puisque mentionnée au sein d'un bloc \score { << \new Staff { - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } c8 c8 c8 c8 } \new Staff { c8 c8 c8 c8 - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } } @@ -3252,7 +3252,7 @@ classique et justifiée à gauche. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3281,7 +3281,7 @@ définissant la propriété @code{proportionalNotationDuration}. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3332,7 +3332,7 @@ une durée de référence élevée produira une musique resserrée. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3350,7 +3350,7 @@ une durée de référence élevée produira une musique resserrée. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3368,7 +3368,7 @@ une durée de référence élevée produira une musique resserrée. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3402,12 +3402,12 @@ ajoutons lui une portée incluant un autre type de nolet. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3428,12 +3428,12 @@ les règles qu'elle applique peuvent amener à ce résultat. Le recours à \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3459,12 +3459,12 @@ allons activer le @code{uniform-stretching}, propriété attachée au \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } diff --git a/Documentation/fr/notation/vocal.itely b/Documentation/fr/notation/vocal.itely index e55096b608..bf812408ca 100644 --- a/Documentation/fr/notation/vocal.itely +++ b/Documentation/fr/notation/vocal.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Valentin Villenave, Jean-Charles Malahieude @c Translation checkers: Jean-Jacques Gerbaud @@ -1906,7 +1906,7 @@ modifie la propriété @code{associatedVoice}. Dans cet exemple, << \new Voice = "alternative" { \voiceOne - \times 2/3 { + \tuplet 3/2 { % show associations clearly. \override NoteColumn.force-hshift = #-3 f8 f g diff --git a/Documentation/fr/usage/lilypond-book.itely b/Documentation/fr/usage/lilypond-book.itely index 27ccb9b922..8c01668252 100644 --- a/Documentation/fr/usage/lilypond-book.itely +++ b/Documentation/fr/usage/lilypond-book.itely @@ -9,7 +9,7 @@ @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Jean-Charles Malahieude @c Translation checkers: @@ -100,7 +100,7 @@ Par exemple, \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -165,7 +165,7 @@ Par exemple, @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/Documentation/hu/learning/common-notation.itely b/Documentation/hu/learning/common-notation.itely index 70fc1f520a..0e7c28c138 100644 --- a/Documentation/hu/learning/common-notation.itely +++ b/Documentation/hu/learning/common-notation.itely @@ -9,7 +9,7 @@ @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @node Elemi kottaÃrás @chapter Elemi kottaÃrás @@ -452,10 +452,10 @@ a @notation{triolák} lejegyzett hosszúságuk 2/3 részéig szólnak, Ãgy trio 2/3 kell, hogy legyen a tört értéke. @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @subheading ElÅ‘kék @@ -1151,7 +1151,7 @@ változóra. @c KEEP LY @lilypond[verbatim,quote] -triolaA = \times 2/3 { c,8 e g } +triolaA = \tuplet 3/2 { c,8 e g } ütemA = { \triolaA \triolaA \triolaA \triolaA } \relative c'' { diff --git a/Documentation/hu/learning/fundamental.itely b/Documentation/hu/learning/fundamental.itely index 3f1d4a5dad..eac8db8e06 100644 --- a/Documentation/hu/learning/fundamental.itely +++ b/Documentation/hu/learning/fundamental.itely @@ -10,7 +10,7 @@ @c -*- coding: utf-8; mode: texinfo; -*- -@c \version "2.17.6" +@c \version "2.17.11" @node Alapfogalmak @chapter Alapfogalmak @translationof Fundamental concepts @@ -482,10 +482,10 @@ frazeálóÃv, amely túlnyúlik a triolán. @lilypond[quote,verbatim,fragment,ragged-right] { - r16[ g16 \times 2/3 {r16 e'8] } - g16( a \times 2/3 {b d) e' } - g8[( a \times 2/3 {b d') e'~]} - \times 4/5 {e'32\( a b d' e'} a'4.\) + r16[ g16 \tuplet 3/2 {r16 e'8] } + g16( a \tuplet 3/2 {b d) e' } + g8[( a \tuplet 3/2 {b d') e'~]} + \tuplet 5/4 {e'32\( a b d' e'} a'4.\) } @end lilypond diff --git a/Documentation/hu/usage/lilypond-book.itely b/Documentation/hu/usage/lilypond-book.itely index 0246b03e49..48617438b5 100644 --- a/Documentation/hu/usage/lilypond-book.itely +++ b/Documentation/hu/usage/lilypond-book.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Note: keep this node named so that `info lilypond-book' brings you here. @node lilypond-book @@ -85,7 +85,7 @@ kottapéldákat tartalmazhatnak. Például: \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -141,7 +141,7 @@ kottapéldákat tartalmazhatnak. Például: @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/Documentation/it/learning/common-notation.itely b/Documentation/it/learning/common-notation.itely index 572adcef52..c3f6acea1d 100644 --- a/Documentation/it/learning/common-notation.itely +++ b/Documentation/it/learning/common-notation.itely @@ -9,7 +9,7 @@ @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @ignore Tutorial guidelines: (different from policy.txt!) @@ -523,10 +523,10 @@ Le terzine fanno sì che le note occupino 2/3 della loro durata, quindi una @notation{terzina} ha 2/3 come frazione: @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @subheading Abbellimenti @@ -1277,7 +1277,7 @@ un'altra variabile successiva, dando la possibilità di accorciare l'input se una sezione della musica viene ripetuta molte volte. @lilypond[verbatim,quote] -tripletA = \times 2/3 { c,8 e g } +tripletA = \tuplet 3/2 { c,8 e g } barA = { \tripletA \tripletA \tripletA \tripletA } \relative c'' { diff --git a/Documentation/it/learning/fundamental.itely b/Documentation/it/learning/fundamental.itely index 7ff22dd629..e05d712950 100644 --- a/Documentation/it/learning/fundamental.itely +++ b/Documentation/it/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Concetti fondamentali @chapter Concetti fondamentali @@ -536,10 +536,10 @@ irregolari, e una legatura di frase che si estende fuori da un gruppo irregolare (linee 3 e 4). @lilypond[quote,verbatim,ragged-right,relative=1] -r16[ g \times 2/3 { r16 e'8] } -g,16( a \times 2/3 { b16 d) e } -g,8[( a \times 2/3 { b8 d) e~] } | -\times 4/5 { e32\( a, b d e } a4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g,16( a \tuplet 3/2 { b16 d) e } +g,8[( a \tuplet 3/2 { b8 d) e~] } | +\tuplet 5/4 { e32\( a, b d e } a4.\) @end lilypond diff --git a/Documentation/it/learning/tweaks.itely b/Documentation/it/learning/tweaks.itely index 790618a6e3..74da8683f0 100644 --- a/Documentation/it/learning/tweaks.itely +++ b/Documentation/it/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Modifica dell'output @chapter Modifica dell'output @@ -451,11 +451,11 @@ deve essere in rosso. @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -472,14 +472,14 @@ aspetto può essere modificato come di consueto con i comandi @code{\override}: @c NOTE Tuplet brackets collide if notes are high on staff @c See issue 509 @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/it/usage/lilypond-book.itely b/Documentation/it/usage/lilypond-book.itely index 77ad3f45c2..6be89d2f74 100644 --- a/Documentation/it/usage/lilypond-book.itely +++ b/Documentation/it/usage/lilypond-book.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Note: keep this node named so that `info lilypond-book' brings you here. @node lilypond-book @@ -87,7 +87,7 @@ Ad esempio, \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -147,7 +147,7 @@ Ad esempio, @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/Documentation/ja/learning/common-notation.itely b/Documentation/ja/learning/common-notation.itely index 44f77490e1..f66ed88030 100644 --- a/Documentation/ja/learning/common-notation.itely +++ b/Documentation/ja/learning/common-notation.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @ignore Tutorial guidelines: (different from policy.txt!) @@ -542,10 +542,10 @@ c2 d | 分数ã¨ã—㦠2/3 ã‚’æŒã¡ã¾ã™ã€‚ @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @@ -1358,7 +1358,7 @@ cello = \new Staff { 楽曲ã®ã‚る部分ãŒä½•åº¦ã‚‚リピートã—ã¦ã„ã‚‹å ´åˆã«å…¥åŠ›ã®æ‰‹é–“ã‚’çœãã“ã¨ãŒã§ãã¾ã™ã€‚ @lilypond[verbatim,quote] -tripletA = \times 2/3 { c,8 e g } +tripletA = \tuplet 3/2 { c,8 e g } barA = { \tripletA \tripletA \tripletA \tripletA } \relative c'' { diff --git a/Documentation/ja/learning/fundamental.itely b/Documentation/ja/learning/fundamental.itely index 69a5e525f0..420cdef760 100644 --- a/Documentation/ja/learning/fundamental.itely +++ b/Documentation/ja/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -587,10 +587,10 @@ LilyPond 以外ã§ã¯ã€ç¨®é¡žã®ç•°ãªã‚‹æ‹¬å¼§ãŒé©åˆ‡ã«ãƒã‚¹ãƒˆã•ã‚Œã‚‹ã ã•ã‚‰ã«ãƒ•ãƒ¬ãƒ¼ã‚¸ãƒ³ã‚° スラーãŒé€£ç¬¦ã®å¤–ã«ã¾ã§ä¼¸ã³ã¦ã„ã¾ã™ (è¡Œ 3 㨠4)。 @lilypond[quote,verbatim,ragged-right,relative=1] -r16[ g \times 2/3 { r16 e'8] } -g,16( a \times 2/3 { b16 d) e } -g,8[( a \times 2/3 { b8 d) e~] } | -\times 4/5 { e32\( a, b d e } a4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g,16( a \tuplet 3/2 { b16 d) e } +g,8[( a \tuplet 3/2 { b8 d) e~] } | +\tuplet 5/4 { e32\( a, b d e } a4.\) @end lilypond diff --git a/Documentation/ja/learning/tweaks.itely b/Documentation/ja/learning/tweaks.itely index 59a43d8196..ec99a79306 100644 --- a/Documentation/ja/learning/tweaks.itely +++ b/Documentation/ja/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -459,11 +459,11 @@ a4^"Black" @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -478,14 +478,14 @@ a4^"Black" @c NOTE Tuplet brackets collide if notes are high on staff @c See issue 509 @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/ja/notation/cheatsheet.itely b/Documentation/ja/notation/cheatsheet.itely index bfa5d66712..7987ccf445 100644 --- a/Documentation/ja/notation/cheatsheet.itely +++ b/Documentation/ja/notation/cheatsheet.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @@ -233,12 +233,12 @@ f8 c2 d e @end lilypond -@item @code{\times 2/3 @{f g a@}} +@item @code{\tuplet 3/2 @{f g a@}} @tab 3 連符 @tab @lilypond[relative=1,fragment] \set Staff.implicitTimeSignatureVisibility = #all-invisible -\times 2/3 { f8 g a } +\tuplet 3/2 { f8 g a } @end lilypond diff --git a/Documentation/ja/notation/fretted-strings.itely b/Documentation/ja/notation/fretted-strings.itely index 970edfb494..41f0dab45c 100644 --- a/Documentation/ja/notation/fretted-strings.itely +++ b/Documentation/ja/notation/fretted-strings.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -1745,7 +1745,7 @@ music = \relative c' { < b\3 \deadNote d\2 b'\1 > < c\3 \deadNote e\2 c'\1 > \deadNotesOn - \times 2/3 { g8 b e } + \tuplet 3/2 { g8 b e } \deadNotesOff < a,\3 c\2 e\1 >1 } diff --git a/Documentation/ja/notation/repeats.itely b/Documentation/ja/notation/repeats.itely index 41a2c5e031..2562f4e5d2 100644 --- a/Documentation/ja/notation/repeats.itely +++ b/Documentation/ja/notation/repeats.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @@ -661,7 +661,7 @@ c1 @lilypond[verbatim,quote,relative=2] \repeat percent 4 { c8. <d f>16 } -\repeat percent 2 { \times 2/3 { r8 c d } e4 } +\repeat percent 2 { \tuplet 3/2 { r8 c d } e4 } @end lilypond @snippets diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely index 08d8844523..7ac549478f 100644 --- a/Documentation/ja/notation/rhythms.itely +++ b/Documentation/ja/notation/rhythms.itely @@ -6,7 +6,7 @@ version that you are working on. See TRANSLATION for details. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -212,8 +212,8 @@ a4 b c4. b8 a4. b4.. c8. ãã®ãŸã‚ã€3 連符ã§æŒ‡å®šã™ã‚‹åˆ†æ•°ã¯ 2/3 ã§ã™ã€‚ @lilypond[quote,verbatim,relative=2] -a2 \times 2/3 { b4 b b } -c4 c \times 2/3 { b4 a g } +a2 \tuplet 3/2 { b4 b b } +c4 c \tuplet 3/2 { b4 a g } @end lilypond @cindex tuplet bracket placement (連符囲ã¿ã®é…ç½®) @@ -232,7 +232,7 @@ c4 c \times 2/3 { b4 a g } @lilypond[quote,verbatim,relative=2] \autoBeamOff -c4 \times 4/5 { f8 e f \times 2/3 { e[ f g] } } f4 +c4 \tuplet 5/4 { f8 e f \tuplet 3/2 { e[ f g] } } f4 @end lilypond ãƒã‚¹ãƒˆã•ã‚ŒãŸé€£ç¬¦ã®æ¼”å¥é–‹å§‹ç‚¹ãŒåŒæ™‚ã§ã‚ã‚‹å ´åˆã«ã€ãれらã®é€£ç¬¦ã‚’変更ã™ã‚‹ã«ã¯ @@ -1647,7 +1647,7 @@ c8 c c \scaleDurations 3/5 { \repeat unfold 2 { c8[ c c] } \repeat unfold 2 { c8[ c] } | - c4. c \times 2/3 { c8[ c c] } c4 + c4. c \tuplet 3/2 { c8[ c c] } c4 } } >> diff --git a/Documentation/ja/notation/spacing.itely b/Documentation/ja/notation/spacing.itely index 8aefc64bdb..6812334ce4 100644 --- a/Documentation/ja/notation/spacing.itely +++ b/Documentation/ja/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @@ -1398,7 +1398,7 @@ c4 c c c | \remove "Forbid_line_break_engraver" } \relative c'' { << - { c2. \times 2/3 { c4 c c } c2. | } + { c2. \tuplet 3/2 { c4 c c } c2. | } { s1 | \break s1 | } >> } @@ -3023,14 +3023,14 @@ c16[ c c8] \score { << \new Staff { - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } c8 c8 c8 c8 } \new Staff { c8 c8 c8 c8 - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } } @@ -3153,7 +3153,7 @@ LilyPond ã¯ãƒ—ãƒãƒãƒ¼ã‚·ãƒ§ãƒŠãƒ« ノーテーション用㫠5 ã¤ã®è¨å®šã \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3183,7 +3183,7 @@ LilyPond ã¯ãƒ—ãƒãƒãƒ¼ã‚·ãƒ§ãƒŠãƒ« ノーテーション用㫠5 ã¤ã®è¨å®šã \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3234,7 +3234,7 @@ LilyPond Scheme 関数 @code{make-moment} 㯠2 ã¤ã®å¼•æ•°ã‚’ã¨ã‚Šã¾ã™ \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3252,7 +3252,7 @@ LilyPond Scheme 関数 @code{make-moment} 㯠2 ã¤ã®å¼•æ•°ã‚’ã¨ã‚Šã¾ã™ \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3270,7 +3270,7 @@ LilyPond Scheme 関数 @code{make-moment} 㯠2 ã¤ã®å¼•æ•°ã‚’ã¨ã‚Šã¾ã™ \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3303,12 +3303,12 @@ LilyPond Scheme 関数 @code{make-moment} 㯠2 ã¤ã®å¼•æ•°ã‚’ã¨ã‚Šã¾ã™ \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3329,12 +3329,12 @@ LilyPond Scheme 関数 @code{make-moment} 㯠2 ã¤ã®å¼•æ•°ã‚’ã¨ã‚Šã¾ã™ \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3361,12 +3361,12 @@ LilyPond Scheme 関数 @code{make-moment} 㯠2 ã¤ã®å¼•æ•°ã‚’ã¨ã‚Šã¾ã™ \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } diff --git a/Documentation/ja/notation/vocal.itely b/Documentation/ja/notation/vocal.itely index e24df80d51..e01ac3f025 100644 --- a/Documentation/ja/notation/vocal.itely +++ b/Documentation/ja/notation/vocal.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -1904,7 +1904,7 @@ text = { << \new Voice = "alternative" { \voiceOne - \times 2/3 { + \tuplet 3/2 { % show associations clearly. \override NoteColumn.force-hshift = #-3 f8 f g diff --git a/Documentation/ja/usage/lilypond-book.itely b/Documentation/ja/usage/lilypond-book.itely index a1f5106dc4..e4f4a69d48 100644 --- a/Documentation/ja/usage/lilypond-book.itely +++ b/Documentation/ja/usage/lilypond-book.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @@ -95,7 +95,7 @@ Windows ã‚„ Mac OS X ã®ã‚³ãƒžãƒ³ãƒ‰ ラインを用ã„㦠@code{lilypond-book} \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -157,7 +157,7 @@ Texinfo ã§å‡¦ç†ã•ã‚Œã‚‹ãŸã‚ã€ä¸Šè¨˜ã®ä¾‹ã¨ã¯ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆãŒå°‘ã—ç•° @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/Documentation/learning/common-notation.itely b/Documentation/learning/common-notation.itely index 949e2bcdc9..ce77939302 100644 --- a/Documentation/learning/common-notation.itely +++ b/Documentation/learning/common-notation.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @ignore Tutorial guidelines: (different from policy.txt!) @@ -508,10 +508,10 @@ Triplets make notes occupy 2/3 of their notated duration, so a @notation{triplet} has 2/3 as its fraction @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @subheading Grace notes @@ -1248,7 +1248,7 @@ of another variable, giving a way of shortening the input if a section of music is repeated many times. @lilypond[verbatim,quote] -tripletA = \times 2/3 { c,8 e g } +tripletA = \tuplet 3/2 { c,8 e g } barA = { \tripletA \tripletA \tripletA \tripletA } \relative c'' { diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely index e1645dae7a..482425df14 100644 --- a/Documentation/learning/fundamental.itely +++ b/Documentation/learning/fundamental.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Fundamental concepts @chapter Fundamental concepts @@ -532,10 +532,10 @@ extending into a tuplet, a tie crossing two tuplets, and a phrasing slur extending out of a tuplet (lines 3 and 4). @lilypond[quote,verbatim,ragged-right,relative=1] -r16[ g \times 2/3 { r16 e'8] } -g,16( a \times 2/3 { b16 d) e } -g,8[( a \times 2/3 { b8 d) e~] } | -\times 4/5 { e32\( a, b d e } a4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g,16( a \tuplet 3/2 { b16 d) e } +g,8[( a \tuplet 3/2 { b8 d) e~] } | +\tuplet 5/4 { e32\( a, b d e } a4.\) @end lilypond diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely index c1db7e9747..5948683ca3 100644 --- a/Documentation/learning/tweaks.itely +++ b/Documentation/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Tweaking output @chapter Tweaking output @@ -478,11 +478,11 @@ printed in red on the first short tuplet bracket. @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -496,14 +496,14 @@ appearance may be modified in the usual way with @cindex TupletNumber, example of overriding @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/ly-examples/aucun-snippet.ly b/Documentation/ly-examples/aucun-snippet.ly index 36779a38f4..74eaa5c71e 100644 --- a/Documentation/ly-examples/aucun-snippet.ly +++ b/Documentation/ly-examples/aucun-snippet.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \include "example-header.ily" \paper { @@ -187,9 +187,9 @@ triplumNotes = \relative c' { f8 f4 e8 d c f f f | % 1 % the \scaleDurations command below makes 5 notes last the % duration of a dotted quarter - e8 c4 \scaleDurations 3/2 { \times 4/5{e16[ d e d e]} } e8 f4 | % 2 + e8 c4 \scaleDurations 3/2 { \tuplet 5/4{e16[ d e d e]} } e8 f4 | % 2 g2. ~ g4. | % 3 - f8 d4 f4. \scaleDurations 3/2 { \times 4/6{ g16[ f e f e f]}} % 4 + f8 d4 f4. \scaleDurations 3/2 { \tuplet 6/4{ g16[ f e f e f]}} % 4 g8 g4 g4. e4. | % 5 fis8 d4 e8\startGroup g4\stopGroup f8[ e d] | % 6 c2. r4. | % 7 diff --git a/Documentation/ly-examples/cary.ly b/Documentation/ly-examples/cary.ly index 1c96edd1bc..78b1ff9370 100644 --- a/Documentation/ly-examples/cary.ly +++ b/Documentation/ly-examples/cary.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" % the example header file caused the head to be chopped off %\include "example-header.ily" @@ -57,15 +57,15 @@ } { % measure 6 - \fraction \times 5/3 { - \times 4/5 { + \fraction \tuplet 3/5 { + \tuplet 5/4 { a'64 [ % 36 cs''64 % 37 f''64 % 38 cs''64 % 39 ef'''64 ] % 40 } - \times 4/5 { + \tuplet 5/4 { g''64 [ % 41 c''64 % 42 e''64 % 43 @@ -77,7 +77,7 @@ % measure 7 r8 % 47 - \times 4/5 { + \tuplet 5/4 { d''32 [ % 48 af''32 % 49 e'32 % 50 @@ -115,7 +115,7 @@ } { % measure 6 - \fraction \times 5/3 { + \fraction \tuplet 3/5 { \square f''16 * 1/8 % 40 \square f''16 * 1/8 % 41 \square f''16 * 1/8 % 42 @@ -124,11 +124,11 @@ \square f''16 * 1/8 % 45 \square f''16 * 1/8 % 46 \square f''16 * 1/8 % 47 - \times 2/3 { + \tuplet 3/2 { \square f''16 % 48 \square f''16 * 1/2 % 49 } - \times 2/3 { + \tuplet 3/2 { \square f''16 * 1/4 % 50 \square f''16 * 1/4 % 51 \square f''16 * 1/4 % 52 @@ -143,7 +143,7 @@ \square g''16 * 2/1 % 57 \square g''16 % 58 \square g''16 % 59 - \times 8/9 { + \tuplet 9/8 { s16 % 60 f''16 * 1/4 % 61 f''16 * 1/4 % 62 @@ -153,8 +153,8 @@ } % measure 8 - \times 4/5 { - \times 4/7 { + \tuplet 5/4 { + \tuplet 7/4 { s4 % 66 \triangle a''16 % 67 \triangle a''16 % 68 @@ -186,7 +186,7 @@ } { % measure 6 - \fraction \times 5/3 { + \fraction \tuplet 3/5 { \blackdiamond f'128 [ % 40 \blackdiamond f'128 % 41 \blackdiamond f'128 % 42 @@ -195,11 +195,11 @@ \blackdiamond f'128 % 45 \blackdiamond f'128 % 46 \blackdiamond f'128 ] % 47 - \times 2/3 { + \tuplet 3/2 { \blackdiamond f'16 % 48 \blackdiamond f'32 % 49 } - \times 2/3 { + \tuplet 3/2 { \blackdiamond f'64 % 50 \blackdiamond f'64 % 51 \blackdiamond f'64 % 52 @@ -214,7 +214,7 @@ \harmonic a'8 \glissando % 57 \harmonic a'16 \glissando % 58 \blackdiamond a'16 % 59 - \times 8/9 { + \tuplet 9/8 { s16 % 60 \harmonic g'64 \glissando % 61 \harmonic g'64 \glissando % 62 @@ -224,8 +224,8 @@ } % measure 8 - \times 4/5 { - \times 4/7 { + \tuplet 5/4 { + \tuplet 7/4 { s4 % 66 \blackdiamond f'16 % 67 \blackdiamond f'16 % 68 @@ -257,7 +257,7 @@ } { % measure 6 - \fraction \times 5/3 { + \fraction \tuplet 3/5 { s128 % 40 s128 % 41 s128 % 42 @@ -266,11 +266,11 @@ s128 % 45 s128 % 46 s128 % 47 - \times 2/3 { + \tuplet 3/2 { \semicircle a16 % 48 \semicircle a16 * 1/2 % 49 } - \times 2/3 { + \tuplet 3/2 { \semicircle a16 * 1/4 % 50 \semicircle a16 * 1/4 % 51 \semicircle a16 * 1/4 % 52 @@ -285,7 +285,7 @@ s8 % 57 s16 % 58 \triangle a16 % 59 - \times 8/9 { + \tuplet 9/8 { s16 % 60 s64 % 61 s64 % 62 @@ -295,8 +295,8 @@ } % measure 8 - \times 4/5 { - \times 4/7 { + \tuplet 5/4 { + \tuplet 7/4 { s4 % 66 \semicircle a16 % 67 \semicircle a16 % 68 @@ -333,7 +333,7 @@ } { % measure 6 - \fraction \times 5/3 { + \fraction \tuplet 3/5 { \beam #0 #5 g,128 \sffp \< [ % 40 \beam #5 #5 g,128 % 41 \beam #5 #5 g,128 % 42 @@ -342,11 +342,11 @@ \beam #5 #5 g,128 % 45 \beam #5 #5 g,128 % 46 \beam #5 #1 g,128 % 47 - \times 2/3 { + \tuplet 3/2 { \beam #1 #2 g,16 % 48 \beam #3 #1 g,32 \fX % 49 } - \times 2/3 { + \tuplet 3/2 { \beam #1 #4 g,64 \sffp \< % 50 \beam #4 #4 g,64 % 51 \beam #4 #4 g,64 % 52 @@ -361,7 +361,7 @@ g,8 \sf \< [ % 57 g,16 % 58 \beam #2 #0 g,16 \ffX ] % 59 - \times 8/9 { + \tuplet 9/8 { r16 % 60 \beam #4 #4 g,64 \sfp \< [ % 61 \beam #4 #4 g,64 % 62 @@ -371,8 +371,8 @@ } % measure 8 - \times 4/5 { - \times 4/7 { + \tuplet 5/4 { + \tuplet 7/4 { r4 % 66 \beam #2 #2 g,16 \fX [ % 67 \beam #2 #2 g,16 \f % 68 diff --git a/Documentation/ly-examples/granados.ly b/Documentation/ly-examples/granados.ly index 96603b5e60..09f4e630d4 100644 --- a/Documentation/ly-examples/granados.ly +++ b/Documentation/ly-examples/granados.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \include "example-header.ily" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -33,8 +33,8 @@ global = { upperVoiceOne = \relative c'' { \voiceOne \override TupletBracket.transparent = ##t - <aes f'>8\([ \times 4/5{g'32( aes g f g]) } - <es aes>8[ \times 4/5{<d bes'>32( c' bes aes bes]) } + <aes f'>8\([ \tuplet 5/4{g'32( aes g f g]) } + <es aes>8[ \tuplet 5/4{<d bes'>32( c' bes aes bes]) } <es, aes es'>8 <d fis b d>\) | % end m. 1 %--------------------------------------------------% <c g' c>4\( \voiceTwo <bes es bes'\arpeggio>\) @@ -42,11 +42,11 @@ upperVoiceOne = \relative c'' { %--------------------------------------------------% \noBreak \voiceOne - <f aes d f>8\([ \times 4/5{<g g'>32( aes' g f g]) } + <f aes d f>8\([ \tuplet 5/4{<g g'>32( aes' g f g]) } \set subdivideBeams = ##t \set baseMoment = #(ly:make-moment 1 8) \set beatStructure = #'(2 2 2) - <aes, aes'>16 <c f> \times 4/5{ bes'32( c bes aes bes]) } + <aes, aes'>16 <c f> \tuplet 5/4{ bes'32( c bes aes bes]) } \set subdivideBeams = ##f \ottava #1 <es es'>16 <f f'> <d d'> \appoggiatura f8 <es es'>16\) } diff --git a/Documentation/nl/learning/common-notation.itely b/Documentation/nl/learning/common-notation.itely index 29ffae1a61..13401a5b8b 100644 --- a/Documentation/nl/learning/common-notation.itely +++ b/Documentation/nl/learning/common-notation.itely @@ -12,7 +12,7 @@ @c Translation checker: @c Translation checker committish: -@c \version "2.16.0" +@c \version "2.17.11" @ignore Tutorial guidelines: (different from policy.txt!) @@ -556,10 +556,10 @@ maakt dat de noten 2/3 van hun lengte duren, dus een @notation{triool} heeft als fractie 2/3 @lilypond[verbatim,quote,relative=2] -\times 2/3 { f8 g a } -\times 2/3 { c8 r c } -\times 2/3 { f,8 g16[ a g a] } -\times 2/3 { d4 a8 } +\tuplet 3/2 { f8 g a } +\tuplet 3/2 { c8 r c } +\tuplet 3/2 { f,8 g16[ a g a] } +\tuplet 3/2 { d4 a8 } @end lilypond @subheading Versieringen @@ -1364,7 +1364,7 @@ compacter in te voeren. @c KEEP LY @lilypond[verbatim,quote] -trioolA = \times 2/3 { c,8 e g } +trioolA = \tuplet 3/2 { c,8 e g } maatA = { \trioolA \trioolA \trioolA \trioolA } \relative c'' { diff --git a/Documentation/nl/learning/fundamental.itely b/Documentation/nl/learning/fundamental.itely index 099fee6885..967bd3c862 100644 --- a/Documentation/nl/learning/fundamental.itely +++ b/Documentation/nl/learning/fundamental.itely @@ -12,7 +12,7 @@ @c Translation checker: @c Translation checker committish: -@c \version "2.17.6" +@c \version "2.17.11" @node Fundamentele concepten @translationof Fundamental concepts @@ -557,10 +557,10 @@ extending into a tuplet, a tie crossing two tuplets, and a phrasing slur extending out of a tuplet (lines 3 and 4). @lilypond[quote,verbatim,ragged-right,relative=1] -r16[ g \times 2/3 { r16 e'8] } -g,16( a \times 2/3 { b16 d) e } -g,8[( a \times 2/3 { b8 d) e~] } | -\times 4/5 { e32\( a, b d e } a4.\) +r16[ g \tuplet 3/2 { r16 e'8] } +g,16( a \tuplet 3/2 { b16 d) e } +g,8[( a \tuplet 3/2 { b8 d) e~] } | +\tuplet 5/4 { e32\( a, b d e } a4.\) @end lilypond diff --git a/Documentation/nl/learning/tweaks.itely b/Documentation/nl/learning/tweaks.itely index 02c6e0acc5..293bedc98a 100644 --- a/Documentation/nl/learning/tweaks.itely +++ b/Documentation/nl/learning/tweaks.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Tweaking output @chapter Tweaking output @@ -461,11 +461,11 @@ printed in red on the first short tuplet bracket. @lilypond[quote,ragged-right,verbatim,fragment,relative=2] \tweak direction #up -\times 4/3 { +\tuplet 3/4 { \tweak color #red - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond @@ -479,14 +479,14 @@ appearance may be modified in the usual way with @cindex TupletNumber, example of overriding @lilypond[quote,ragged-right,verbatim,fragment,relative=1] -\times 2/3 { c8[ c c] } +\tuplet 3/2 { c8[ c c] } \once \override TupletNumber.text = #tuplet-number::calc-fraction-text -\times 2/3 { +\tuplet 3/2 { c8[ c] c8[ c] \once \override TupletNumber.transparent = ##t - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } @end lilypond diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely index 0056b8be0f..970fa0a535 100644 --- a/Documentation/notation/ancient.itely +++ b/Documentation/notation/ancient.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Ancient notation @@ -2779,9 +2779,9 @@ adjustments are necessary, this can be easily done with spiritus = \relative c' { \time 1/4 \override Lyrics.LyricText.X-extent = #'(0 . 3) - d4 \times 2/3 { f8 a g } g a a4 g f8 e + d4 \tuplet 3/2 { f8 a g } g a a4 g f8 e d4 f8 g g8 d f g a g f4 g8 a a4 s - \times 2/3 { g8 f d } e f g a g4 + \tuplet 3/2 { g8 f d } e f g a g4 } spirLyr = \lyricmode { diff --git a/Documentation/notation/cheatsheet.itely b/Documentation/notation/cheatsheet.itely index 89fe8ebb10..cc737a484f 100644 --- a/Documentation/notation/cheatsheet.itely +++ b/Documentation/notation/cheatsheet.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c TODO: add tablature. @@ -227,12 +227,12 @@ f8 c2 d e @end lilypond -@item @code{\times 2/3 @{f g a@}} +@item @code{\tuplet 3/2 @{f g a@}} @tab triplets @tab @lilypond[relative=1] \set Staff.implicitTimeSignatureVisibility = #all-invisible -\times 2/3 { f8 g a } +\tuplet 3/2 { f8 g a } @end lilypond diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely index b6afe1b581..9219cd5514 100644 --- a/Documentation/notation/fretted-strings.itely +++ b/Documentation/notation/fretted-strings.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Fretted string instruments @section Fretted string instruments @@ -1709,7 +1709,7 @@ music = \relative c' { < b\3 \deadNote d\2 b'\1 > < c\3 \deadNote e\2 c'\1 > \deadNotesOn - \times 2/3 { g8 b e } + \tuplet 3/2 { g8 b e } \deadNotesOff < a,\3 c\2 e\1 >1 } diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely index 53da1bdf74..ef22c2835e 100644 --- a/Documentation/notation/repeats.itely +++ b/Documentation/notation/repeats.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @node Repeats @section Repeats @@ -660,7 +660,7 @@ use a double-percent symbol. @lilypond[verbatim,quote,relative=2] \repeat percent 4 { c8. <d f>16 } -\repeat percent 2 { \times 2/3 { r8 c d } e4 } +\repeat percent 2 { \tuplet 3/2 { r8 c d } e4 } @end lilypond @snippets diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index b6d303eeb5..9121d09f3e 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Rhythms @section Rhythms @@ -204,8 +204,8 @@ tuplet is the triplet in which 3 notes have the duration of 2, so the notes are 2/3 of their written length. @lilypond[quote,verbatim,relative=2] -a2 \times 2/3 { b4 b b } -c4 c \times 2/3 { b4 a g } +a2 \tuplet 3/2 { b4 b b } +c4 c \tuplet 3/2 { b4 a g } @end lilypond @cindex tuplet bracket placement @@ -224,7 +224,7 @@ Tuplets may be nested: @lilypond[quote,verbatim,relative=2] \autoBeamOff -c4 \times 4/5 { f8 e f \times 2/3 { e[ f g] } } f4 +c4 \tuplet 5/4 { f8 e f \tuplet 3/2 { e[ f g] } } f4 @end lilypond Modifying nested tuplets which begin at the same musical moment @@ -1636,7 +1636,7 @@ affect the autobeaming rules. \scaleDurations 3/5 { \repeat unfold 2 { c8[ c c] } \repeat unfold 2 { c8[ c] } | - c4. c \times 2/3 { c8[ c c] } c4 + c4. c \tuplet 3/2 { c8[ c c] } c4 } } >> diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index 8352e5a8be..16e27488d7 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @ignore GDP TODO list @@ -1393,7 +1393,7 @@ with the music: \remove "Forbid_line_break_engraver" } \relative c'' { << - { c2. \times 2/3 { c4 c c } c2. | } + { c2. \tuplet 3/2 { c4 c c } c2. | } { s1 | \break s1 | } >> } @@ -2921,14 +2921,14 @@ property can only be changed at the beginning of a score, \score { << \new Staff { - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } c8 c8 c8 c8 } \new Staff { c8 c8 c8 c8 - \times 4/5 { + \tuplet 5/4 { c8 c8 c8 c8 c8 } } @@ -3042,7 +3042,7 @@ spacing with ragged-right turned on. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3071,7 +3071,7 @@ setting. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3119,7 +3119,7 @@ larger reference durations space music tightly. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3137,7 +3137,7 @@ larger reference durations space music tightly. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3155,7 +3155,7 @@ larger reference durations space music tightly. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } @@ -3187,12 +3187,12 @@ tuplet. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3211,12 +3211,12 @@ result. Setting @code{proportionalNotationDuration} fixes this. \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } @@ -3242,12 +3242,12 @@ turn on @code{uniform-stretching}, which is a property of \new RhythmicStaff { c'2 c'16 c'16 c'16 c'16 - \times 4/5 { + \tuplet 5/4 { c'16 c'16 c'16 c'16 c'16 } } \new RhythmicStaff { - \times 8/9 { + \tuplet 9/8 { c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 c'8 } } diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely index 89e08f4409..f9e51ffa90 100644 --- a/Documentation/notation/vocal.itely +++ b/Documentation/notation/vocal.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Vocal music @section Vocal music @@ -1857,7 +1857,7 @@ within the lyrics by setting the @code{associatedVoice} property: << \new Voice = "alternative" { \voiceOne - \times 2/3 { + \tuplet 3/2 { % show associations clearly. \override NoteColumn.force-hshift = #-3 f8 f g diff --git a/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly index 5a05847427..5912d2d8aa 100644 --- a/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly +++ b/Documentation/snippets/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rhythms.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "expressive-marks, rhythms" @@ -26,9 +26,9 @@ sections (enclosed within curly braces). { - r16[ g16 \times 2/3 { r16 e'8] } - g16( a \times 2/3 { b d e') } - g8[( a \times 2/3 { b d') e'] ~ } + r16[ g16 \tuplet 3/2 { r16 e'8] } + g16( a \tuplet 3/2 { b d e') } + g8[( a \tuplet 3/2 { b d') e'] ~ } \time 2/4 - \times 4/5 { e'32\( a b d' e' } a'4.\) + \tuplet 5/4 { e'32\( a b d' e' } a'4.\) } diff --git a/Documentation/snippets/changing-the-tuplet-number.ly b/Documentation/snippets/changing-the-tuplet-number.ly index 5d4d889106..134be35310 100644 --- a/Documentation/snippets/changing-the-tuplet-number.ly +++ b/Documentation/snippets/changing-the-tuplet-number.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "rhythms" @@ -21,10 +21,10 @@ be printed, or the tuplet number may be suppressed altogether. \relative c'' { - \times 2/3 { c8 c c } - \times 2/3 { c8 c c } + \tuplet 3/2 { c8 c c } + \tuplet 3/2 { c8 c c } \override TupletNumber.text = #tuplet-number::calc-fraction-text - \times 2/3 { c8 c c } + \tuplet 3/2 { c8 c c } \override TupletNumber.stencil = ##f - \times 2/3 { c8 c c } + \tuplet 3/2 { c8 c c } } diff --git a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly index 736114f59b..9c74de6b45 100644 --- a/Documentation/snippets/controlling-tuplet-bracket-visibility.ly +++ b/Documentation/snippets/controlling-tuplet-bracket-visibility.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "rhythms, tweaks-and-overrides" @@ -23,9 +23,9 @@ bracket), @code{#f} (never print a bracket) or @code{#'if-no-beam} music = \relative c'' { - \times 2/3 { c16[ d e } f8] - \times 2/3 { c8 d e } - \times 2/3 { c4 d e } + \tuplet 3/2 { c16[ d e } f8] + \tuplet 3/2 { c8 d e } + \tuplet 3/2 { c4 d e } } \new Voice { diff --git a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly index 343279e64b..489f0db3b9 100644 --- a/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/Documentation/snippets/creating-a-sequence-of-notes-on-various-pitches.ly @@ -5,7 +5,7 @@ % % This file is in the public domain. %% Note: this file works from version 2.16.0 -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "pitches, real-music, really-cool, scheme-language" @@ -25,7 +25,7 @@ Planets. rhythm = #(define-music-function (parser location p) (ly:pitch?) "Make the rhythm in Mars (the Planets) at the given pitch" - #{ \times 2/3 { $p 8 $p $p } $p 4 $p $p 8 $p $p 4 #}) + #{ \tuplet 3/2 { $p 8 $p $p } $p 4 $p $p 8 $p $p 4 #}) \new Staff { \time 5/4 diff --git a/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly b/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly index 384c90017e..c83f493935 100644 --- a/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly +++ b/Documentation/snippets/entering-several-tuplets-using-only-one--times-command.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "rhythms, syntax-and-expressions" @@ -29,6 +29,6 @@ information about @code{ly:make-moment}. \relative c' { \time 2/4 - \set tupletSpannerDuration = #(ly:make-moment 1 4) - \times 2/3 { c8 c c c c c } + \tupletSpan 4 + \tuplet 3/2 { c8 c c c c c } } diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly index b24c847840..0583274b6c 100644 --- a/Documentation/snippets/flamenco-notation.ly +++ b/Documentation/snippets/flamenco-notation.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "fretted-strings, specific-notation, stylesheet, version-specific" @@ -148,7 +148,7 @@ part = \relative c' { r4 \tupletOff - \times 4/5 { + \tuplet 5/4 { <a e' a cis e>16^\xUp \headsOff <a e' a cis e>^\aUp @@ -161,7 +161,7 @@ part = \relative c' { r4 \tupletsOff - \times 2/3 { + \tuplet 3/2 { <a e' a cis e>8^\pDown \headsOff <a e' a cis e>^\xUp @@ -169,7 +169,7 @@ part = \relative c' { \headsOn } - \times 2/3 { + \tuplet 3/2 { <a e' a cis e>8^\pDown \headsOff <a e' a cis e>^\xUp @@ -177,14 +177,14 @@ part = \relative c' { \headsOn } - \times 2/3 { + \tuplet 3/2 { <a e' a cis e>8^\pDown \headsOff <a e' a cis e>^\xUp <a e' a cis e>^\iUp \headsOn } - \times 2/3 { + \tuplet 3/2 { <a e' a cis e>8^\pDown \headsOff <a e' a cis e>^\xUp @@ -194,22 +194,22 @@ part = \relative c' { \tupletsOff \override Beam.positions = #'(2 . 2) - \times 2/3 { + \tuplet 3/2 { a8^\markup{ \small p } <e' a>^\strokeUpGolpe <e a>^\strokeDown } - \times 2/3 { + \tuplet 3/2 { a,8^\markup{ \small p } <e' a>^\strokeUpGolpe <e a>^\strokeDown } - \times 2/3 { + \tuplet 3/2 { a,8^\markup{ \small p } <e' a>^\strokeUpGolpe <e a>^\strokeDown } - \times 2/3 { + \tuplet 3/2 { a,8^\markup{ \small p } <e' a>^\strokeUpGolpe <e a>^\strokeDown diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly index 9349251044..8c228ee330 100644 --- a/Documentation/snippets/fretted-headword.ly +++ b/Documentation/snippets/fretted-headword.ly @@ -10,7 +10,7 @@ % on melodies from Bellini's "Norma" % %*****************************************************************% -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -81,22 +81,22 @@ melody = \relative c { R1 % m. 5 e'4^\benmarcato e8. d16-4 - d4-4 \times 2/3 { \sfou \FO #'-0.3 #'0.6 <c-2>4 b8 } | % end of m. 6 + d4-4 \tuplet 3/2 { \sfou \FO #'-0.3 #'0.6 <c-2>4 b8 } | % end of m. 6 \FO #'-0.3 #'0.3 - <a-3>4 \times 2/3 { c4 b8 } a4 e'8. e16 | % m. 7 + <a-3>4 \tuplet 3/2 { c4 b8 } a4 e'8. e16 | % m. 7 \FO #'-0.3 #'0.3 - <g-4>4 \times 2/3 { \sfol \FO #'0.3 #'0.0 <f-1>4 e8 } e4 % beg of m. 8 - \times 2/3 { \sfou <d-4>4 c8 } | % end of m. 8 + <g-4>4 \tuplet 3/2 { \sfol \FO #'0.3 #'0.0 <f-1>4 e8 } e4 % beg of m. 8 + \tuplet 3/2 { \sfou <d-4>4 c8 } | % end of m. 8 - b4 \times 2/3 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 <b-0>4 e | % end of m. 9 + b4 \tuplet 3/2 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 <b-0>4 e | % end of m. 9 - e4 e8. d16-4 d4 \times 2/3 { c4 b8 } | % m. 10 + e4 e8. d16-4 d4 \tuplet 3/2 { c4 b8 } | % m. 10 - \times 2/3 { a4 a8 b4 c8 } % beg of m. 11 + \tuplet 3/2 { a4 a8 b4 c8 } % beg of m. 11 \sfou \FO #'-0.3 #'0.3 - <d-4>4^\< \times 2/3 { e4 <d f>8\! } | % end of m. 11 + <d-4>4^\< \tuplet 3/2 { e4 <d f>8\! } | % end of m. 11 } bass = \relative c { @@ -116,21 +116,21 @@ bass = \relative c { %% new section starts here in A minor \set Score.beamExceptions = #'() \once \override TextScript.staff-padding = #1.7 - \times 2/3 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 + \tuplet 3/2 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 - \times 2/3 { a,8\pdolce e' a c a e } % beg m. 6 - \times 2/3 { e,8 \sfou <e'-3> <gis-1> c gis e } | % end m. 6 + \tuplet 3/2 { a,8\pdolce e' a c a e } % beg m. 6 + \tuplet 3/2 { e,8 \sfou <e'-3> <gis-1> c gis e } | % end m. 6 - \times 2/3 { a,8 <e'-2> a c e, b' a, e' a c a e } | % m. 7 + \tuplet 3/2 { a,8 <e'-2> a c e, b' a, e' a c a e } | % m. 7 - \times 2/3 { f,8 f' a \sfol \FO #'0.3 #'-0.5 <d-4> a f fis, d' a' d a d, } | % m. 8 + \tuplet 3/2 { f,8 f' a \sfol \FO #'0.3 #'-0.5 <d-4> a f fis, d' a' d a d, } | % m. 8 - \times 2/3 { <g,-3>8 d' g d' g, d % beg m. 9 + \tuplet 3/2 { <g,-3>8 d' g d' g, d % beg m. 9 \sfod \FO #'0.0 #'-2.0 <gis,-4> \sfou <e'-2> <gis-1> b gis e } | % end m. 9 - \times 2/3 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 + \tuplet 3/2 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 - \times 2/3 { a,8 e' a b a e f, f' a d a f } | % m. 11 + \tuplet 3/2 { a,8 e' a b a e f, f' a d a f } | % m. 11 } \score { diff --git a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly index d556d5b80d..571723635f 100644 --- a/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly +++ b/Documentation/snippets/inserting-score-fragments-above-a-staff,-as-markups.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "real-music, staff-notation" @@ -39,8 +39,8 @@ tuning = \markup { \relative c'' { \time 4/8 - \times 2/3 { c8 d e } \times 2/3 { c d e } - \times 2/3 { c8 d e } \times 2/3 { c d e } + \tuplet 3/2 { c8 d e } \tuplet 3/2 { c d e } + \tuplet 3/2 { c8 d e } \tuplet 3/2 { c d e } g8 a g a g8 a g a } diff --git a/Documentation/snippets/modifying-tuplet-bracket-length.ly b/Documentation/snippets/modifying-tuplet-bracket-length.ly index 3cff9d1059..bde66e6168 100644 --- a/Documentation/snippets/modifying-tuplet-bracket-length.ly +++ b/Documentation/snippets/modifying-tuplet-bracket-length.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "really-simple, rhythms" @@ -30,11 +30,11 @@ modify what material they cover. % ...to cover all items up to the next note \set tupletFullLengthNote = ##t \time 2/4 - \times 2/3 { c4 c c } + \tuplet 3/2 { c4 c c } % ...or to cover just whitespace \set tupletFullLengthNote = ##f \time 4/4 - \times 4/5 { c4 c1 } + \tuplet 5/4 { c4 c1 } \time 3/4 c2. } diff --git a/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly b/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly index ea2d8305a9..8e9a8c65b4 100644 --- a/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly +++ b/Documentation/snippets/new/creating-a-sequence-of-notes-on-various-pitches.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "pitches, real-music, really-cool, scheme-language" @@ -17,7 +17,7 @@ Planets. rhythm = #(define-music-function (parser location p) (ly:pitch?) "Make the rhythm in Mars (the Planets) at the given pitch" - #{ \times 2/3 { $p 8 $p $p } $p 4 $p $p 8 $p $p 4 #}) + #{ \tuplet 3/2 { $p 8 $p $p } $p 4 $p $p 8 $p $p 4 #}) \new Staff { \time 5/4 diff --git a/Documentation/snippets/new/fretted-headword.ly b/Documentation/snippets/new/fretted-headword.ly index b7b6b58dec..11b57ee7bc 100644 --- a/Documentation/snippets/new/fretted-headword.ly +++ b/Documentation/snippets/new/fretted-headword.ly @@ -3,7 +3,7 @@ % on melodies from Bellini's "Norma" % %*****************************************************************% -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -73,22 +73,22 @@ melody = \relative c { R1 % m. 5 e'4^\benmarcato e8. d16-4 - d4-4 \times 2/3 { \sfou \FO #'-0.3 #'0.6 <c-2>4 b8 } | % end of m. 6 + d4-4 \tuplet 3/2 { \sfou \FO #'-0.3 #'0.6 <c-2>4 b8 } | % end of m. 6 \FO #'-0.3 #'0.3 - <a-3>4 \times 2/3 { c4 b8 } a4 e'8. e16 | % m. 7 + <a-3>4 \tuplet 3/2 { c4 b8 } a4 e'8. e16 | % m. 7 \FO #'-0.3 #'0.3 - <g-4>4 \times 2/3 { \sfol \FO #'0.3 #'0.0 <f-1>4 e8 } e4 % beg of m. 8 - \times 2/3 { \sfou <d-4>4 c8 } | % end of m. 8 + <g-4>4 \tuplet 3/2 { \sfol \FO #'0.3 #'0.0 <f-1>4 e8 } e4 % beg of m. 8 + \tuplet 3/2 { \sfou <d-4>4 c8 } | % end of m. 8 - b4 \times 2/3 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 <b-0>4 e | % end of m. 9 + b4 \tuplet 3/2 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 <b-0>4 e | % end of m. 9 - e4 e8. d16-4 d4 \times 2/3 { c4 b8 } | % m. 10 + e4 e8. d16-4 d4 \tuplet 3/2 { c4 b8 } | % m. 10 - \times 2/3 { a4 a8 b4 c8 } % beg of m. 11 + \tuplet 3/2 { a4 a8 b4 c8 } % beg of m. 11 \sfou \FO #'-0.3 #'0.3 - <d-4>4^\< \times 2/3 { e4 <d f>8\! } | % end of m. 11 + <d-4>4^\< \tuplet 3/2 { e4 <d f>8\! } | % end of m. 11 } bass = \relative c { @@ -108,21 +108,21 @@ bass = \relative c { %% new section starts here in A minor \set Score.beamExceptions = #'() \once \override TextScript.staff-padding = #1.7 - \times 2/3 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 + \tuplet 3/2 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 - \times 2/3 { a,8\pdolce e' a c a e } % beg m. 6 - \times 2/3 { e,8 \sfou <e'-3> <gis-1> c gis e } | % end m. 6 + \tuplet 3/2 { a,8\pdolce e' a c a e } % beg m. 6 + \tuplet 3/2 { e,8 \sfou <e'-3> <gis-1> c gis e } | % end m. 6 - \times 2/3 { a,8 <e'-2> a c e, b' a, e' a c a e } | % m. 7 + \tuplet 3/2 { a,8 <e'-2> a c e, b' a, e' a c a e } | % m. 7 - \times 2/3 { f,8 f' a \sfol \FO #'0.3 #'-0.5 <d-4> a f fis, d' a' d a d, } | % m. 8 + \tuplet 3/2 { f,8 f' a \sfol \FO #'0.3 #'-0.5 <d-4> a f fis, d' a' d a d, } | % m. 8 - \times 2/3 { <g,-3>8 d' g d' g, d % beg m. 9 + \tuplet 3/2 { <g,-3>8 d' g d' g, d % beg m. 9 \sfod \FO #'0.0 #'-2.0 <gis,-4> \sfou <e'-2> <gis-1> b gis e } | % end m. 9 - \times 2/3 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 + \tuplet 3/2 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 - \times 2/3 { a,8 e' a b a e f, f' a d a f } | % m. 11 + \tuplet 3/2 { a,8 e' a b a e f, f' a d a f } | % m. 11 } \score { diff --git a/Documentation/snippets/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly index 64aafafb70..65030025a3 100644 --- a/Documentation/snippets/non-default-tuplet-numbers.ly +++ b/Documentation/snippets/non-default-tuplet-numbers.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "rhythms" @@ -21,28 +21,28 @@ to the tuplet number or tuplet fraction. \relative c'' { \once \override TupletNumber.text = #(tuplet-number::non-default-tuplet-denominator-text 7) - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } \once \override TupletNumber.text = #(tuplet-number::non-default-tuplet-fraction-text 12 7) - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } \once \override TupletNumber.text = #(tuplet-number::append-note-wrapper (tuplet-number::non-default-tuplet-fraction-text 12 7) "8") - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } \once \override TupletNumber.text = #(tuplet-number::append-note-wrapper tuplet-number::calc-denominator-text "4") - \times 2/3 { c8 c8 c8 c8 c8 c8 } + \tuplet 3/2 { c8 c8 c8 c8 c8 c8 } \once \override TupletNumber.text = #(tuplet-number::append-note-wrapper tuplet-number::calc-fraction-text "4") - \times 2/3 { c8 c8 c8 c8 c8 c8 } + \tuplet 3/2 { c8 c8 c8 c8 c8 c8 } \once \override TupletNumber.text = #(tuplet-number::fraction-with-notes "4." "8") - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } \once \override TupletNumber.text = #(tuplet-number::non-default-fraction-with-notes 12 "8" 4 "4") - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } } diff --git a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly index 0e8590c7ac..c67206c3aa 100644 --- a/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly +++ b/Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "rhythms, version-specific" @@ -30,9 +30,9 @@ tuplets have to be beamed manually. } \relative c'' { a8 - \repeat unfold 5 { \times 2/3 { c[ b a] } } + \repeat unfold 5 { \tuplet 3/2 { c[ b a] } } % Insert a manual line break within a tuplet - \times 2/3 { c[ b \bar "" \break a] } - \repeat unfold 5 { \times 2/3 { c[ b a] } } + \tuplet 3/2 { c[ b \bar "" \break a] } + \repeat unfold 5 { \tuplet 3/2 { c[ b a] } } c8 } diff --git a/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly b/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly index 8df5f99d76..d529d28669 100644 --- a/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly +++ b/Documentation/snippets/preventing-final-mark-from-removing-final-tuplet.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "rhythms" @@ -22,9 +22,9 @@ tuplet marking. This can be overcome by setting @code{TupletBracket \new Staff { \set tupletFullLength = ##t \time 1/8 - \times 2/3 { c'16 c'16 c'16 } - \times 2/3 { c'16 c'16 c'16 } - \times 2/3 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } \override Score.RehearsalMark.break-visibility = ##(#t #t #t) \override Score.RehearsalMark.direction = #DOWN \override Score.RehearsalMark.self-alignment-X = #RIGHT @@ -40,9 +40,9 @@ tuplet marking. This can be overcome by setting @code{TupletBracket \override TupletBracket.full-length-to-extent = ##f \time 1/8 - \times 2/3 { c'16 c'16 c'16 } - \times 2/3 { c'16 c'16 c'16 } - \times 2/3 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } \override Score.RehearsalMark.break-visibility = ##(#t #t #t) \override Score.RehearsalMark.direction = #DOWN \override Score.RehearsalMark.self-alignment-X = #RIGHT diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly index 2f5821a6b7..6b817fd1fc 100644 --- a/Documentation/snippets/printing-music-with-different-time-signatures.ly +++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "contemporary-notation, percussion, real-music, really-cool, rhythms" @@ -79,12 +79,12 @@ Bassklarinette = \new Staff \with { \bar "|" \time 2/4 \tupletUp - \times 2/3 { ees''4 r4 d''4 ~ } + \tuplet 3/2 { ees''4 r4 d''4 ~ } \bar "|" \time 3/8 \tupletUp - \times 3/4 { d''4 r4 } + \tuplet 4/3 { d''4 r4 } \bar "|" \time 2/4 diff --git a/Documentation/snippets/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly index 90b9148df5..3598d57811 100644 --- a/Documentation/snippets/proportional-strict-notespacing.ly +++ b/Documentation/snippets/proportional-strict-notespacing.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "spacing, tweaks-and-overrides" @@ -27,7 +27,7 @@ the note that occurs at the same time. This may cause collisions. c2 \grace { c16[ c16] } c2 } \new Staff { - c2 \times 2/3 { c8 \clef bass cis,, c } c4 + c2 \tuplet 3/2 { c8 \clef bass cis,, c } c4 c1 } >> diff --git a/Documentation/snippets/screech-and-boink.ly b/Documentation/snippets/screech-and-boink.ly index 68e858368b..86b9fba5e5 100644 --- a/Documentation/snippets/screech-and-boink.ly +++ b/Documentation/snippets/screech-and-boink.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -41,7 +41,7 @@ Random complex notation c'''32([ b''16 a''16 gis''16 g''32)] } \\ - { s4 \times 2/3 { d'16[ f' g'] } as'32[ b''32 e'' d''] } + { s4 \tuplet 3/2 { d'16[ f' g'] } as'32[ b''32 e'' d''] } \\ { s4 \autoBeamOff d''8.. f''32 } \\ diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly index c6d9644ab9..9c6a9184f9 100644 --- a/Documentation/snippets/unfretted-headword.ly +++ b/Documentation/snippets/unfretted-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -163,16 +163,16 @@ ViolinSolo = \relative c' { \time 4/4 \stemUp \tupletDown - \times 2/3 { d4 ^\markup \colmark { \quatre \db \accel } d d } - \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d } + \tuplet 3/2 { d4 ^\markup \colmark { \quatre \db \accel } d d } + \tuplet 3/2 { d4 ^\markup \colmark { " " \db " " \sulp } d d } %% Measure 5 \time 5/4 - \tupletbp \times 2/3 { d8 \mf \< ^\markup \colmark { \quatre \db \norm } d _\open d } - \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db \sulp } d _\open d } - \tupletbp \times 2/3 { d16 ^\markup \colmark { " " \db \norm } d _\open d d d _\open d } + \tupletbp \tuplet 3/2 { d8 \mf \< ^\markup \colmark { \quatre \db \norm } d _\open d } + \tupletbp \tuplet 3/2 { d8 ^\markup \colmark { " " \db \sulp } d _\open d } + \tupletbp \tuplet 3/2 { d16 ^\markup \colmark { " " \db \norm } d _\open d d d _\open d } d2 \ff ^\markup \colmark { " " \pvib } \> @@ -187,11 +187,11 @@ ViolinSolo = \relative c' { %% Measure 7 \time 7/4 - \tupletbp \times 2/3 { d16 ^\markup \colmark { \quatre } d _\open d d d _\open d } - \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db } d _\open d } - \tupletbp \times 2/3 { d8 ^\markup \colmark { " " \db " " \sulp } d _\open d } - \times 2/3 { d4 ^\markup \colmark { \quatre \db \ritar \norm } d d } - \times 2/3 { d4 ^\markup \colmark { " " \db " " \sulp } d d \ppp ~ } + \tupletbp \tuplet 3/2 { d16 ^\markup \colmark { \quatre } d _\open d d d _\open d } + \tupletbp \tuplet 3/2 { d8 ^\markup \colmark { " " \db } d _\open d } + \tupletbp \tuplet 3/2 { d8 ^\markup \colmark { " " \db " " \sulp } d _\open d } + \tuplet 3/2 { d4 ^\markup \colmark { \quatre \db \ritar \norm } d d } + \tuplet 3/2 { d4 ^\markup \colmark { " " \db " " \sulp } d d \ppp ~ } %% Measure 8 diff --git a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly index dfbb0c8a50..4a85d9d6a4 100644 --- a/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly +++ b/Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "spacing, tweaks-and-overrides, vocal-music" @@ -39,7 +39,7 @@ positioning of lyrics and ossias. \override StaffSymbol.staff-space = #(magstep -2) \remove "Time_signature_engraver" } { - \times 4/6 { + \tuplet 6/4 { \override TextScript.padding = #3 c8[^"ossia above" d e d e f] } diff --git a/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely index 5225b67d5c..3bfa098934 100644 --- a/Documentation/usage/lilypond-book.itely +++ b/Documentation/usage/lilypond-book.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.16.0" +@c \version "2.17.11" @c Note: keep this node named so that `info lilypond-book' brings you here. @node lilypond-book @@ -86,7 +86,7 @@ For example, \begin{lilypond} \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } \end{lilypond} @@ -145,7 +145,7 @@ For example, @lilypond \relative c' { - c2 e2 \times 2/3 { f8 a b } a2 e4 + c2 e2 \tuplet 3/2 { f8 a b } a2 e4 } @end lilypond diff --git a/input/regression/alignment-order.ly b/input/regression/alignment-order.ly index 907e3eae36..88e1ec2481 100644 --- a/input/regression/alignment-order.ly +++ b/input/regression/alignment-order.ly @@ -3,7 +3,7 @@ anywhere in the vertical alignment. " } -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t @@ -22,7 +22,7 @@ anywhere in the vertical alignment. " } \new Staff { \set Staff.alignAboveContext = #"3" - \times 4/6 { + \tuplet 6/4 { \override TextScript.padding = #3 c4^"this" d_"staff" e^"above" d_"last" e^"staff" f } diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index 121a22f79f..a9229e1df2 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -4,10 +4,10 @@ texidoc = "Automatic beaming is also done on tuplets." } -\version "2.16.0" +\version "2.17.11" \layout { ragged-right= ##t } \relative c''{ c8 c c c - \times 4/6 { c c c c c c} + \tuplet 6/4 { c c c c c c} } diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index e6b36894d3..1b9e3abb1f 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on @@ -8,9 +8,9 @@ beams even if they're auto generated." \layout { ragged-right= ##t } \relative c' { - \set tupletSpannerDuration = #(ly:make-moment 1 4) + \tupletSpan 4 \override TupletBracket.bracket-visibility = #'if-no-beam - \times 2/3 { + \tuplet 3/2 { f8[ f f ] f8[ f f ] f f f f f f } } diff --git a/input/regression/autobeam-tuplet-recheck.ly b/input/regression/autobeam-tuplet-recheck.ly index fbd81b8ec2..37a1361d9b 100644 --- a/input/regression/autobeam-tuplet-recheck.ly +++ b/input/regression/autobeam-tuplet-recheck.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { @@ -10,7 +10,7 @@ In the example, the first beat should be beamed completely together." \relative c' { \time 2/4 c16 c - \times 2/3 { c8 c16 } - \times 2/3 { c8 c16 } + \tuplet 3/2 { c8 c16 } + \tuplet 3/2 { c8 c16 } c16 c } diff --git a/input/regression/backend-excercise.ly b/input/regression/backend-excercise.ly index 5191c53312..018c014da8 100644 --- a/input/regression/backend-excercise.ly +++ b/input/regression/backend-excercise.ly @@ -2,7 +2,7 @@ texidoc = "Exercise all output functions" } -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t } @@ -11,7 +11,7 @@ \new Staff { \ottava #1 - \times 2/3 { c8[\< f]( f''\!) } + \tuplet 3/2 { c8[\< f]( f''\!) } \ottava #0 <f,, \5>4 diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 6d0e6d4ed1..21c755c255 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.17.11" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. @@ -23,7 +23,7 @@ extreme = \relative c'' { %%%%%%% \stemNeutral - \times 2/3{ d16[ fis' d,]} \times 2/3{ cis[ g'' cis,,]} + \tuplet 3/2{ d16[ fis' d,]} \tuplet 3/2{ cis[ g'' cis,,]} a'16 cis a, g''' % Used to give a nice beam directed upwards. \stemNeutral diff --git a/input/regression/beam-slope-stemlet.ly b/input/regression/beam-slope-stemlet.ly index 0593907d1b..f64237ab22 100644 --- a/input/regression/beam-slope-stemlet.ly +++ b/input/regression/beam-slope-stemlet.ly @@ -6,7 +6,7 @@ as invisible stems." } -\version "2.17.6" +\version "2.17.11" \layout { ragged-right = ##t @@ -14,9 +14,9 @@ as invisible stems." } \relative c' { - \times 2/3 {r8[ c' g']} + \tuplet 3/2 {r8[ c' g']} \override Stem.stemlet-length = #0.5 - \times 2/3 {r8[ c, g']} + \tuplet 3/2 {r8[ c, g']} } diff --git a/input/regression/beam-subdivide-tuplets.ly b/input/regression/beam-subdivide-tuplets.ly index 93223c969d..516ba7141f 100644 --- a/input/regression/beam-subdivide-tuplets.ly +++ b/input/regression/beam-subdivide-tuplets.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { @@ -13,8 +13,8 @@ the beams should be subdivided every 1/8. } \relative c' { - \set tupletSpannerDuration = #(ly:make-moment 1 4) + \tupletSpan 4 \set baseMoment = #(ly:make-moment 1 8) \set subdivideBeams = ##t - \times 4/6 { \repeat unfold 24 { c16 } } + \tuplet 6/4 { \repeat unfold 24 { c16 } } } diff --git a/input/regression/beaming-tuplet-regular.ly b/input/regression/beaming-tuplet-regular.ly index caac0a6f6d..0c0a4c91cf 100644 --- a/input/regression/beaming-tuplet-regular.ly +++ b/input/regression/beaming-tuplet-regular.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { @@ -8,7 +8,7 @@ Beams in a completed tuplet should be continuous. } { - \times 2/3 {b16 b b} b8 b8 \times 2/3 {b16 b b} - \times 1/3 {b16 b b} b8. b \times 1/3 {b16 b b} + \tuplet 3/2 {b16 b b} b8 b8 \tuplet 3/2 {b16 b b} + \tuplet 3/1 {b16 b b} b8. b \tuplet 3/1 {b16 b b} } diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 39cdfe5370..bb8bba1872 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "2.16.0" +\version "2.17.11" \header{ texidoc=" @@ -10,7 +10,7 @@ case, line breaks are forbidden. \context Staff \relative c'' { - c8[ \times 2/3 { c16 d e] } + c8[ \tuplet 3/2 { c16 d e] } s4*3 c8.[ c16] diff --git a/input/regression/beamlet-test.ly b/input/regression/beamlet-test.ly index d2a8667a6d..5ec8e4b5a6 100644 --- a/input/regression/beamlet-test.ly +++ b/input/regression/beamlet-test.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = " @@ -8,29 +8,29 @@ broken beat units. This should work in tuplets as well as in ordinary time. } \relative c'' { - \times 2/3 { + \tuplet 3/2 { c8. c16 c8 } - \times 2/3 { + \tuplet 3/2 { c8 c16 c8. } - \times 4/5 { + \tuplet 5/4 { c8[ c8. c16 c8 c8] } - \times 4/5 { + \tuplet 5/4 { c8[ c8 c16 c8. c8] } - \times 4/5 { + \tuplet 5/4 { c8 c16 c8. c8 c8 } - \times 4/5 { + \tuplet 5/4 { c8 c8 c8. c16 c8 } c8.[ c16 c8 c8] c8[ c16 c8. c8] c8[ c8. c16 c8] c8.[ c16 c8. c16] - \times 4/5 { c8 [ c16 c8 c16 c8 c8 ] } - \times 4/5 { a8 a32 a8 a16. a8 a8 } + \tuplet 5/4 { c8 [ c16 c8 c16 c8 c8 ] } + \tuplet 5/4 { a8 a32 a8 a16. a8 a8 } } diff --git a/input/regression/chord-repetition-times.ly b/input/regression/chord-repetition-times.ly index d70b80aab0..ba8f1fdbe6 100644 --- a/input/regression/chord-repetition-times.ly +++ b/input/regression/chord-repetition-times.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { @@ -11,5 +11,5 @@ correctly on them. \relative c' { <c e g>4 r <c e g>2 ~ | - \times 2/3 { <c e g>4 q q } \times 2/3 { q q q } | + \tuplet 3/2 { <c e g>4 q q } \tuplet 3/2 { q q q } | } diff --git a/input/regression/completion-heads-tuplets.ly b/input/regression/completion-heads-tuplets.ly index 305f58a128..e2e397618f 100644 --- a/input/regression/completion-heads-tuplets.ly +++ b/input/regression/completion-heads-tuplets.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = " @@ -15,6 +15,6 @@ Completion heads may be used with tuplets (and compressed music) too. } \context Staff \relative c'' { - \set tupletSpannerDuration = #(ly:make-moment 1 1) - \times 2/3 { g1 g g } + \tupletSpan 1 + \tuplet 3/2 { g1 g g } } diff --git a/input/regression/completion-heads-unit.ly b/input/regression/completion-heads-unit.ly index f88ab32ef9..c4d9289af9 100644 --- a/input/regression/completion-heads-unit.ly +++ b/input/regression/completion-heads-unit.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = " @@ -21,6 +21,6 @@ Note head completion may be broken into sub-bar units by setting the g'1.. g2 \time 6/4 \set completionUnit = #(ly:make-moment 1 4) - \set tupletSpannerDuration = #(ly:make-moment 1 4) - \times 2/3 { e4 c8 f g a4 b8 c4 b8 a4 g8 a e f4 } + \tupletSpan 4 + \tuplet 3/2 { e4 c8 f g a4 b8 c4 b8 a4 g8 a e f4 } } diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 2ecae684e4..95f864de03 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" #(use-modules (srfi srfi-13) (ice-9 format)) @@ -178,9 +178,9 @@ stderr of this run." \test ##[ { \change Staff = "up" { c d } } #] % ContextChange %% Tuplets -\test ##[ \times 2/3 { c8 d e } #] % TimeScaledMusic -\test ##[ \times 4/6 { c16 d e f g a } #] -\test ##[ \times 2/3 { c d e \times 2/5 { f e d2 d4 } c } #] +\test ##[ \tuplet 3/2 { c8 d e } #] % TimeScaledMusic +\test ##[ \tuplet 6/4 { c16 d e f g a } #] +\test ##[ \tuplet 3/2 { c d e \tuplet 5/2 { f e d2 d4 } c } #] %} %% \relative and \tranpose \test #"NOT A BUG" ##[ \relative c' { c b } #] % RelativeOctaveMusic diff --git a/input/regression/dot-column-engraver.ly b/input/regression/dot-column-engraver.ly index 8c6b087f51..f87e23f038 100644 --- a/input/regression/dot-column-engraver.ly +++ b/input/regression/dot-column-engraver.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Dot Columns are engraved in the Staff by default, @@ -9,7 +9,7 @@ and these dots avoid notes in other voices." music = \relative c'' { \time 3/4 << { <d f g>4. c c b g f a <a b> a <a' b> -} \\ \times 1/2 { +} \\ \tuplet 2/1 { <f, g b>2. a-- <a b> <g a>-. a2. a-- a a b <a b> \bar "|." } >> } diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 820386f114..7cea105e64 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "2.16.0" +\version "2.17.11" \header{ @@ -18,7 +18,7 @@ Main note scripts do not end up on the grace note. \grace b8 c4\fermata \grace { c32[ cis32] } gis4 \grace { cis32[ dis32] } e4 - \grace { c32[ d] }\times 2/3 { c8[ c c] } + \grace { c32[ d] }\tuplet 3/2 { c8[ c c] } \grace { b32[ ( c32] } c4) \grace <c d>16 c8[ c8] % \grace c16 c8[ c8] diff --git a/input/regression/lyric-combine-switch-voice.ly b/input/regression/lyric-combine-switch-voice.ly index 7548edad73..28f99fd58e 100644 --- a/input/regression/lyric-combine-switch-voice.ly +++ b/input/regression/lyric-combine-switch-voice.ly @@ -5,7 +5,7 @@ if the switch occurs together with context instantiation." } -\version "2.17.6" +\version "2.17.11" << \relative \new Voice = "lahlah" { @@ -14,7 +14,7 @@ if the switch occurs together with context instantiation." << \new Voice = "alternative" { \voiceOne - \times 2/3 { + \tuplet 3/2 { %% show associations clearly. \override NoteColumn.force-hshift = #-3 r8 f g diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly index 9d0943f390..cedcb39d2d 100644 --- a/input/regression/lyric-combine.ly +++ b/input/regression/lyric-combine.ly @@ -1,5 +1,5 @@ -\version "2.16.0" +\version "2.17.11" \header{ @@ -19,7 +19,7 @@ lyrics ignore any other rhythms in the piece." m = \relative c'' { \autoBeamOff - g8( a) r8 \times 2/3 { g'8( f e) } r8 \grace { d16[ c b] } e4 + g8( a) r8 \tuplet 3/2 { g'8( f e) } r8 \grace { d16[ c b] } e4 \textLengthOff d8.^"melisma" \melisma c16 \melismaEnd diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly index 71860fb49f..ffac9f2e68 100644 --- a/input/regression/markup-score.ly +++ b/input/regression/markup-score.ly @@ -2,7 +2,7 @@ texidoc = "Use \\score block as markup command." } -\version "2.16.0" +\version "2.17.11" tuning = \markup { \score { @@ -24,8 +24,8 @@ tuning = \markup { \relative c'' { \time 4/8 - \times 2/3 { c8 d e } \times 2/3 {c d e} - \times 2/3 { c8 d e } \times 2/3 {c d e} + \tuplet 3/2 { c8 d e } \tuplet 3/2 {c d e} + \tuplet 3/2 { c8 d e } \tuplet 3/2 {c d e} g8 a8 g8 a g8 a8 g8 a } diff --git a/input/regression/metronome-mark-broken-bound.ly b/input/regression/metronome-mark-broken-bound.ly index 16325e9557..52f5b13962 100644 --- a/input/regression/metronome-mark-broken-bound.ly +++ b/input/regression/metronome-mark-broken-bound.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "A @code{MetronomeMark}, @code{RehearsalMark} and @code{BarNumber} @@ -20,7 +20,7 @@ should not effect the starting point of spanners. \override Beam.breakable = ##t \override Glissando.breakable = ##t - \ottava #1 \times 1/1 { e'8\<\startTextSpan\startTrillSpan\glissando + \ottava #1 \tuplet 1/1 { e'8\<\startTextSpan\startTrillSpan\glissando [ \override NoteColumn.glissando-skip = ##t\repeat unfold 22 e'8 \revert NoteColumn.glissando-skip e'8\!\stopTextSpan\stopTrillSpan ] } | } diff --git a/input/regression/midi-tuplets.ly b/input/regression/midi-tuplets.ly index 11153ded7d..49cda2ccc4 100644 --- a/input/regression/midi-tuplets.ly +++ b/input/regression/midi-tuplets.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = " @@ -21,11 +21,11 @@ Midi2ly tuplet test. a1 a2 a2. a4 a4. a8 a8. a16 a16. a32 a32. a64 - \times 2/3 { b4 b4 b4 } - \times 3/5 { b4 b4 b4 b4 b4 } + \tuplet 3/2 { b4 b4 b4 } + \tuplet 5/3 { b4 b4 b4 b4 b4 } - \times 2/3 { c8 c8 c8 } - \times 3/5 { c8 c8 c8 c8 c8 } + \tuplet 3/2 { c8 c8 c8 } + \tuplet 5/3 { c8 c8 c8 c8 c8 } } \layout { } diff --git a/input/regression/mozart-hrn3-allegro.ily b/input/regression/mozart-hrn3-allegro.ily index 5aff496652..a961de79d0 100644 --- a/input/regression/mozart-hrn3-allegro.ily +++ b/input/regression/mozart-hrn3-allegro.ily @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \include "mozart-hrn3-defs.ily" allegro = \relative c' { @@ -130,19 +130,19 @@ allegro = \relative c' { c4) r r2 R1 | \mark "H" - \times 2/3 { c8[ b a ] } - \times 2/3 { g[ a b] } - \times 2/3 { c[ d e] } - \times 2/3 { f[ e d] } | - \times 2/3 { c[ b a ] } - \times 2/3 { g[ a b] } - \times 2/3 { c[ d e] } - \times 2/3 { f[ e d] }| - c4 \times 2/3 { r8 g'[( e)]} c4 - \times 2/3 { r8 e[ ( c)]} | - g4 \times 2/3 { r8 c8[( g)] } - \times 2/3 { e[ ( g) e-. ] } - \times 2/3 { c[ ( e) c-.] }| + \tuplet 3/2 { c8[ b a ] } + \tuplet 3/2 { g[ a b] } + \tuplet 3/2 { c[ d e] } + \tuplet 3/2 { f[ e d] } | + \tuplet 3/2 { c[ b a ] } + \tuplet 3/2 { g[ a b] } + \tuplet 3/2 { c[ d e] } + \tuplet 3/2 { f[ e d] }| + c4 \tuplet 3/2 { r8 g'[( e)]} c4 + \tuplet 3/2 { r8 e[ ( c)]} | + g4 \tuplet 3/2 { r8 c8[( g)] } + \tuplet 3/2 { e[ ( g) e-. ] } + \tuplet 3/2 { c[ ( e) c-.] }| g4 r8 g'\f a[ b c d]| \afterGrace d1_(\trill { c16[ d] } c4) r r2 diff --git a/input/regression/part-combine-tuplet-end.ly b/input/regression/part-combine-tuplet-end.ly index a1636a7e6f..0c1c5ce195 100644 --- a/input/regression/part-combine-tuplet-end.ly +++ b/input/regression/part-combine-tuplet-end.ly @@ -5,14 +5,14 @@ even after a switch, a tuplet ends correctly." } -\version "2.16.0" +\version "2.17.11" \new Staff << \partcombine \relative c'' { r2 - \times 2/3 { g8[ g g] } - \times 2/3 { g[ g g] } g1 + \tuplet 3/2 { g8[ g g] } + \tuplet 3/2 { g[ g g] } g1 } \relative c'' { R1 g1 } >> diff --git a/input/regression/part-combine-tuplet-single.ly b/input/regression/part-combine-tuplet-single.ly index 37029bae09..1cdd5009e7 100644 --- a/input/regression/part-combine-tuplet-single.ly +++ b/input/regression/part-combine-tuplet-single.ly @@ -5,17 +5,17 @@ \paper { ragged-right = ##T } -\version "2.16.0" +\version "2.17.11" \score { << \new Staff { \partcombine \relative c'' { - \times 2/3 { d4 d d ~ } d2 + \tuplet 3/2 { d4 d d ~ } d2 } \relative c'' { - \times 2/3 { b4 a g ~ } g2 + \tuplet 3/2 { b4 a g ~ } g2 } } >> diff --git a/input/regression/phrasing-slur-tuplet.ly b/input/regression/phrasing-slur-tuplet.ly index 5be066d2ce..0f5aa8302a 100644 --- a/input/regression/phrasing-slur-tuplet.ly +++ b/input/regression/phrasing-slur-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Phrasing slurs do not collide with tuplet numbers." @@ -6,7 +6,7 @@ \relative c'' { \voiceOne - \times 2/3 { + \tuplet 3/2 { c8\( b c } a2.\) diff --git a/input/regression/quote-tuplet-end.ly b/input/regression/quote-tuplet-end.ly index 55798ba5a2..c796d79b3e 100644 --- a/input/regression/quote-tuplet-end.ly +++ b/input/regression/quote-tuplet-end.ly @@ -3,12 +3,12 @@ texidoc ="Tuplet bracket ends properly when quoting." } -\version "2.16.0" +\version "2.17.11" \paper { ragged-right = ##t } \addQuote x { - \times 2/3 { a'8 a' a' } a'4 a'2 | + \tuplet 3/2 { a'8 a' a' } a'4 a'2 | } \new Staff << diff --git a/input/regression/quote-tuplet.ly b/input/regression/quote-tuplet.ly index 1b9d9f2833..420f8641ba 100644 --- a/input/regression/quote-tuplet.ly +++ b/input/regression/quote-tuplet.ly @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.17.11" \header { @@ -9,7 +9,7 @@ } foo = \relative c' { - \times 2/3 { c4 c c } \times 2/3 { c4 c c } + \tuplet 3/2 { c4 c c } \tuplet 3/2 { c4 c c } } \addQuote "foo" { \foo } diff --git a/input/regression/repeat-slash-mixed.ly b/input/regression/repeat-slash-mixed.ly index 0daf8a185e..3c0decb5e3 100644 --- a/input/regression/repeat-slash-mixed.ly +++ b/input/regression/repeat-slash-mixed.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Beat repeats for patterns containing mixed durations use @@ -10,7 +10,7 @@ a double percent symbol." c8. <d f>16 } \repeat percent 2 { - \times 2/3 { + \tuplet 3/2 { r8 d e } c4 diff --git a/input/regression/skiptypesetting-tuplet.ly b/input/regression/skiptypesetting-tuplet.ly index 8849fa4907..b2f6262915 100644 --- a/input/regression/skiptypesetting-tuplet.ly +++ b/input/regression/skiptypesetting-tuplet.ly @@ -7,15 +7,15 @@ } -\version "2.16.0" +\version "2.17.11" \paper { ragged-right = ##T } \new Staff \relative c' { \set Score.skipTypesetting = ##t - \times 2/3 { c8 c c } \times 2/3 { c c c } - \times 2/3 { c c c } \times 2/3 { c c c} + \tuplet 3/2 { c8 c c } \tuplet 3/2 { c c c } + \tuplet 3/2 { c c c } \tuplet 3/2 { c c c} \set Score.skipTypesetting = ##f d1 \break c diff --git a/input/regression/slur-shift-region.ly b/input/regression/slur-shift-region.ly index 5d3304f382..8a43894cd5 100644 --- a/input/regression/slur-shift-region.ly +++ b/input/regression/slur-shift-region.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "A slur's shift region is automatically made @@ -6,5 +6,5 @@ higher to accommodate extra encompass elements." } \relative c' { - c'2( \times 2/3 { g4 e c) } + c'2( \tuplet 3/2 { g4 e c) } } diff --git a/input/regression/slur-tuplet.ly b/input/regression/slur-tuplet.ly index cfcf4397cc..202ea32713 100644 --- a/input/regression/slur-tuplet.ly +++ b/input/regression/slur-tuplet.ly @@ -5,7 +5,7 @@ This may not work if the slur starts after the tuplet. " } -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t @@ -17,7 +17,7 @@ This may not work if the slur starts after the tuplet. " \override TupletBracket.bracket-visibility = ##f \override Slur.details.region-size = #6 - \times 2/3 + \tuplet 3/2 { c( g' c,) } diff --git a/input/regression/song-reordering.ly b/input/regression/song-reordering.ly index 30a5d9b663..472c008dbd 100644 --- a/input/regression/song-reordering.ly +++ b/input/regression/song-reordering.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc="Festival song synthesis output supports reordered lyrics. @@ -14,7 +14,7 @@ reordered lyrics. << \context Voice = alternative { \voiceOne - \times 2/3 { + \tuplet 3/2 { \override NoteColumn.force-hshift = #-3 f8 f g } diff --git a/input/regression/song-reordering2.ly b/input/regression/song-reordering2.ly index b958e5279d..5c5fec17ff 100644 --- a/input/regression/song-reordering2.ly +++ b/input/regression/song-reordering2.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc="Festival song synthesis output supports reordered lyrics. @@ -19,7 +19,7 @@ reordered lyrics. } \context Voice = alternative { \voiceOne - \times 2/3 { + \tuplet 3/2 { \override NoteColumn.force-hshift = #-3 f8 f g } diff --git a/input/regression/spacing-loose-polyphony.ly b/input/regression/spacing-loose-polyphony.ly index 18f2ba4628..43fdb6e8d4 100644 --- a/input/regression/spacing-loose-polyphony.ly +++ b/input/regression/spacing-loose-polyphony.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Loose columns (here, the treble clef) are spaced @@ -8,7 +8,7 @@ correctly in polyphonic music. \new PianoStaff << \new Staff \relative c' { - \times 2/3 { g'4 a2 } + \tuplet 3/2 { g'4 a2 } } \new Staff \relative c' { \clef bass fis,,8 cis' diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly index 2ac5360241..bab9232a8d 100644 --- a/input/regression/spacing-multi-tuplet.ly +++ b/input/regression/spacing-multi-tuplet.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header{ @@ -18,12 +18,12 @@ hence it must be switched on explicitly with the \relative c' { \context StaffGroup << \new Staff \context Voice { - \times 2/10 { c8[ c c c c c c c c c] } - \times 2/10 { c[ c c c c c c c c c] } + \tuplet 10/2 { c8[ c c c c c c c c c] } + \tuplet 10/2 { c[ c c c c c c c c c] } } \new Staff \context Voice { - \times 2/11 { c8[ c c c c c c c c c c] } - \times 2/11 { c[ c c c c c c c c c c] } + \tuplet 11/2 { c8[ c c c c c c c c c c] } + \tuplet 11/2 { c[ c c c c c c c c c c] } } >> } diff --git a/input/regression/spacing-proportional.ly b/input/regression/spacing-proportional.ly index 9160af59af..dcd83eba4c 100644 --- a/input/regression/spacing-proportional.ly +++ b/input/regression/spacing-proportional.ly @@ -6,7 +6,7 @@ to the distance for the given duration." } -\version "2.16.0" +\version "2.17.11" \paper { ragged-right = ##t } @@ -14,7 +14,7 @@ to the distance for the given duration." << \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) \new Staff { c8[ c c c c c] c4 c2 r2 } - \new Staff { c2 \times 2/3 { c8 c c } c4 c1 } + \new Staff { c2 \tuplet 3/2 { c8 c c } c4 c1 } >> diff --git a/input/regression/spacing-strict-notespacing.ly b/input/regression/spacing-strict-notespacing.ly index b8b3e0b178..d91bacf38d 100644 --- a/input/regression/spacing-strict-notespacing.ly +++ b/input/regression/spacing-strict-notespacing.ly @@ -9,7 +9,7 @@ time. This may cause collisions. " } -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t @@ -30,7 +30,7 @@ time. This may cause collisions. " \grace { c16[ c16] } c2 } \new Staff { - c2 \times 2/3 { c8 \clef bass cis,, c } + c2 \tuplet 3/2 { c8 \clef bass cis,, c } c4 c1 } diff --git a/input/regression/spacing-uniform-stretching.ly b/input/regression/spacing-uniform-stretching.ly index 57e284f6aa..16cd079404 100644 --- a/input/regression/spacing-uniform-stretching.ly +++ b/input/regression/spacing-uniform-stretching.ly @@ -6,7 +6,7 @@ } -\version "2.17.6" +\version "2.17.11" \relative c'' << @@ -15,7 +15,7 @@ c16[ c c c c c c c c c16] } \new Staff { - \times 6/7 { c16 c c cis c c c } + \tuplet 7/6 { c16 c c cis c c c } c8[ c32 c32 c16] } diff --git a/input/regression/spanner-break-overshoot.ly b/input/regression/spanner-break-overshoot.ly index 6f22cc6ddd..02ffba9a5c 100644 --- a/input/regression/spanner-break-overshoot.ly +++ b/input/regression/spanner-break-overshoot.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "The @code{break-overshoot} property sets the amount that @@ -14,5 +14,5 @@ prefatory matter." \override TupletBracket.break-overshoot = #'(1.0 . 2.0) \override TupletBracket.bracket-visibility = ##t \override Beam.breakable = ##t - c2.. \times 2/3 { c8.[ \break c8.] } + c2.. \tuplet 3/2 { c8.[ \break c8.] } } diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly index 1dd829a5d8..7e42a72a5c 100644 --- a/input/regression/staff-mixed-size.ly +++ b/input/regression/staff-mixed-size.ly @@ -7,7 +7,7 @@ large on smaller staves." } -\version "2.17.6" +\version "2.17.11" \layout { ragged-right = ##t @@ -15,7 +15,7 @@ large on smaller staves." melody = \relative c''' { \override DynamicText.extra-offset = #'(0 . 3) - s1-\f c8[(\< r a g]) e[ r d( <f a>])\! \times 2/3 { d4 d d } + s1-\f c8[(\< r a g]) e[ r d( <f a>])\! \tuplet 3/2 { d4 d d } } << diff --git a/input/regression/tablature-full-notation.ly b/input/regression/tablature-full-notation.ly index 2c40bba8e8..55f6547911 100644 --- a/input/regression/tablature-full-notation.ly +++ b/input/regression/tablature-full-notation.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header{ texidoc = "As default, tablature staves show only the fret numbers, because in most situations, they are combined with normal staves. @@ -18,7 +18,7 @@ tabstuff = { \ottava #1 r4 d'4 r8 e | \ottava #0 - \times 3/4 { b,4 c \glissando d\5 \glissando c } | + \tuplet 4/3 { b,4 c \glissando d\5 \glissando c } | c4. d-_( | e\varcoda-> ) \override TextSpanner.bound-details.left.text = "rit." f\startTextSpan | diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index e65cbd8d95..6b84baa674 100644 --- a/input/regression/tuplet-beam.ly +++ b/input/regression/tuplet-beam.ly @@ -1,5 +1,5 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "In combination with a beam, the bracket of the tuplet @@ -10,8 +10,8 @@ the bracket." \layout { ragged-right= ##t } \context Voice\relative c'' { - \times 2/3 { r c8[ c8] } - \times 2/3 { c8[ c c] } - \times 2/3 { c16[ c16] c8[ c8] } + \tuplet 3/2 { r c8[ c8] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c16[ c16] c8[ c8] } } diff --git a/input/regression/tuplet-bracket-avoid-fingering.ly b/input/regression/tuplet-bracket-avoid-fingering.ly index 4a164f83df..719851b26d 100644 --- a/input/regression/tuplet-bracket-avoid-fingering.ly +++ b/input/regression/tuplet-bracket-avoid-fingering.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "@code{TupletBracket} grobs avoid @code{Fingering} grobs. @@ -7,5 +7,5 @@ \relative d'' { \override TupletBracket.direction = #UP - \times 2/3 { d4 a8-4 } + \tuplet 3/2 { d4 a8-4 } } diff --git a/input/regression/tuplet-bracket-avoid-scripts.ly b/input/regression/tuplet-bracket-avoid-scripts.ly index 8df61c5950..1cccccde46 100644 --- a/input/regression/tuplet-bracket-avoid-scripts.ly +++ b/input/regression/tuplet-bracket-avoid-scripts.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Tuplet brackets avoid scripts by default. @@ -6,5 +6,5 @@ } \relative c'' { - \times 2/3 { a8^\espressivo r a^\espressivo } + \tuplet 3/2 { a8^\espressivo r a^\espressivo } } diff --git a/input/regression/tuplet-bracket-avoid-string-number.ly b/input/regression/tuplet-bracket-avoid-string-number.ly index d92768ee44..62ce79a461 100644 --- a/input/regression/tuplet-bracket-avoid-string-number.ly +++ b/input/regression/tuplet-bracket-avoid-string-number.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "@code{TupletBracket} grobs avoid @code{StringNumber} grobs. @@ -7,5 +7,5 @@ \relative d'' { \override TupletBracket.direction = #UP - \times 2/3 { d4 <a\4>8 } + \tuplet 3/2 { d4 <a\4>8 } } diff --git a/input/regression/tuplet-bracket-cross-staff.ly b/input/regression/tuplet-bracket-cross-staff.ly index 7f864fa85d..2e6c9d0f34 100644 --- a/input/regression/tuplet-bracket-cross-staff.ly +++ b/input/regression/tuplet-bracket-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t @@ -17,12 +17,12 @@ even across multiple staves." } voice = { - \times 2/3 { b8 \change Staff=I c' d' } - \times 2/3 { d' c' \change Staff=II b } - \times 2/3 { \change Staff=III c, + \tuplet 3/2 { b8 \change Staff=I c' d' } + \tuplet 3/2 { d' c' \change Staff=II b } + \tuplet 3/2 { \change Staff=III c, \change Staff=II b \change Staff=I c' } - \times 2/3 { c'[ \change Staff=II b] c } + \tuplet 3/2 { c'[ \change Staff=II b] c } } \score { diff --git a/input/regression/tuplet-bracket-direction.ly b/input/regression/tuplet-bracket-direction.ly index ea8c1ea752..1713160738 100644 --- a/input/regression/tuplet-bracket-direction.ly +++ b/input/regression/tuplet-bracket-direction.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "The direction of tuplet brackets is the direction @@ -8,13 +8,13 @@ to UP. } \relative c'' { - \times 2/3 { r r r } - \times 2/3 { r c r } - \times 2/3 { r a r } - \times 2/3 { c' f,, r } - \times 2/3 { f, c'' r } - \times 2/3 { a a c } - \times 2/3 { c c a } - \times 2/3 { a a a } - \times 2/3 { c c c } + \tuplet 3/2 { r r r } + \tuplet 3/2 { r c r } + \tuplet 3/2 { r a r } + \tuplet 3/2 { c' f,, r } + \tuplet 3/2 { f, c'' r } + \tuplet 3/2 { a a c } + \tuplet 3/2 { c c a } + \tuplet 3/2 { a a a } + \tuplet 3/2 { c c c } } diff --git a/input/regression/tuplet-bracket-outside-staff-priority.ly b/input/regression/tuplet-bracket-outside-staff-priority.ly index a8e54dcffb..ecfa6814f7 100644 --- a/input/regression/tuplet-bracket-outside-staff-priority.ly +++ b/input/regression/tuplet-bracket-outside-staff-priority.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "Tuplet brackets' outside staff priority can be @@ -9,14 +9,14 @@ set. Brackets, by default, carry their numbers with them." \relative c'' { \override TupletBracket.avoid-scripts = ##f % Plain old tuplet - \times 2/3 { a8 r a } + \tuplet 3/2 { a8 r a } % With nothing set, collisions abound both horizontally and % vertically - \times 2/3 { a8^\espressivo r a^\espressivo } + \tuplet 3/2 { a8^\espressivo r a^\espressivo } % Setting the staff priority prevents collisions \override TupletBracket.outside-staff-priority = #1 - \times 2/3 { a8^\espressivo r a^\espressivo } + \tuplet 3/2 { a8^\espressivo r a^\espressivo } % Note that, with the outside-staff-priority set, this bracket % should be at the same vertical level as the first one - \times 2/3 { a8 r a } + \tuplet 3/2 { a8 r a } } diff --git a/input/regression/tuplet-bracket-vertical-skylines.ly b/input/regression/tuplet-bracket-vertical-skylines.ly index 160259135c..752f595128 100644 --- a/input/regression/tuplet-bracket-vertical-skylines.ly +++ b/input/regression/tuplet-bracket-vertical-skylines.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "Tuplet brackets do not push objects with outside-staff-priority @@ -8,5 +8,5 @@ too high. \relative c' { \override TupletBracket.direction = #UP - \times 1/1 { a^"foo" a' a' a' } + \tuplet 1/1 { a^"foo" a' a' a' } } diff --git a/input/regression/tuplet-bracket-visibility.ly b/input/regression/tuplet-bracket-visibility.ly index 5de92d9563..1d4a986ac5 100644 --- a/input/regression/tuplet-bracket-visibility.ly +++ b/input/regression/tuplet-bracket-visibility.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "The default behavior of tuplet-bracket visibility is to print a bracket @@ -21,9 +21,9 @@ unless there is a beam of the same length as the tuplet. Overriding } music = \relative c'' { - \times 2/3 { c16[ d e } f8] - \times 2/3 { c8 d e } - \times 2/3 { c4 d e } + \tuplet 3/2 { c16[ d e } f8] + \tuplet 3/2 { c8 d e } + \tuplet 3/2 { c4 d e } } \new Voice { diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly index 25b50f359f..9021ead4b1 100644 --- a/input/regression/tuplet-broken.ly +++ b/input/regression/tuplet-broken.ly @@ -8,7 +8,7 @@ } -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t @@ -23,7 +23,7 @@ (markup #:fontsize 6 #:arrow-head X LEFT #f) (markup #:arrow-head X RIGHT #f)) - \times 11/19 { + \tuplet 19/11 { c4 c4 c4 c4 \bar "-" \break c4 c4 c4 c4 diff --git a/input/regression/tuplet-full-length-extent.ly b/input/regression/tuplet-full-length-extent.ly index 425604fd9c..f7cf547b16 100644 --- a/input/regression/tuplet-full-length-extent.ly +++ b/input/regression/tuplet-full-length-extent.ly @@ -4,16 +4,16 @@ attaching column for a full-length tuplet bracket can be ignored." } -\version "2.17.6" +\version "2.17.11" \new Staff { \set tupletFullLength = ##t \time 1/8 - \times 2/3 { c'16 c'16 c'16 } - \times 2/3 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } \override TupletBracket.full-length-to-extent = ##f - \times 2/3 { c'16 c'16 c'16 } + \tuplet 3/2 { c'16 c'16 c'16 } \override Score.RehearsalMark.break-visibility = ##(#t #t #t) \override Score.RehearsalMark.direction = #down \mark "xxxxxxxxxxxxxxxxxxxxxxx" diff --git a/input/regression/tuplet-full-length-note.ly b/input/regression/tuplet-full-length-note.ly index 9553f9101a..06806188b4 100644 --- a/input/regression/tuplet-full-length-note.ly +++ b/input/regression/tuplet-full-length-note.ly @@ -6,17 +6,17 @@ the next note, by setting @code{tupletFullLengthNote}." } -\version "2.16.0" +\version "2.17.11" \new RhythmicStaff { \set tupletFullLength = ##t \time 4/4 - \times 4/5 { + \tuplet 5/4 { c'4 c'1 } \set tupletFullLengthNote = ##t \time 2/4 - \times 2/3 { + \tuplet 3/2 { c4 c c } \time 3/4 diff --git a/input/regression/tuplet-full-length.ly b/input/regression/tuplet-full-length.ly index ac161cdfda..28c1c8f325 100644 --- a/input/regression/tuplet-full-length.ly +++ b/input/regression/tuplet-full-length.ly @@ -5,7 +5,7 @@ start of the next non-tuplet note. " } -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t indent = 0.0 } @@ -17,12 +17,12 @@ indent = 0.0 } { \set tupletFullLength = ##t c4 - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c \bar "-" \break c] } - << \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c \bar "-" \break c] } + << \tuplet 3/2 { c8[ c c] } { s4*5/6 \bar "-" \break } >> c4 - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } \bar "|." \key c\minor } diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly index 1c75daa260..4bf91a6e4d 100644 --- a/input/regression/tuplet-gap.ly +++ b/input/regression/tuplet-gap.ly @@ -5,7 +5,7 @@ } -\version "2.17.6" +\version "2.17.11" \layout { indent = 0.0\mm @@ -15,6 +15,6 @@ \relative c'' { \override TupletNumber.text = #tuplet-number::calc-fraction-text - \times 17/12 { c8 c4 c8 c8} + \tuplet 12/17 { c8 c4 c8 c8} } diff --git a/input/regression/tuplet-nest-beam.ly b/input/regression/tuplet-nest-beam.ly index 65a5773794..a163eb262b 100644 --- a/input/regression/tuplet-nest-beam.ly +++ b/input/regression/tuplet-nest-beam.ly @@ -5,13 +5,13 @@ } -\version "2.16.0" +\version "2.17.11" \paper{ ragged-right=##t } { - \times 4/7 { - \times 4/5 { c'8 d' e' f' g' } a' b' c'' + \tuplet 7/4 { + \tuplet 5/4 { c'8 d' e' f' g' } a' b' c'' } } diff --git a/input/regression/tuplet-nest-broken.ly b/input/regression/tuplet-nest-broken.ly index 915e889039..33876e0034 100644 --- a/input/regression/tuplet-nest-broken.ly +++ b/input/regression/tuplet-nest-broken.ly @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "Broken nested tuplets avoid each other correctly. @@ -19,24 +19,24 @@ r2 - \times 4/3 { - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/4 { + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } - \times 4/3 { - \times 2/3 { a8[ a a] } - \times 2/3 { a8[ a a] } - \times 2/3 { a8[ a a] } + \tuplet 3/4 { + \tuplet 3/2 { a8[ a a] } + \tuplet 3/2 { a8[ a a] } + \tuplet 3/2 { a8[ a a] } } \override TupletNumber.text = #tuplet-number::calc-fraction-text - \times 4/6 { - \times 2/3 { + \tuplet 6/4 { + \tuplet 3/2 { a4 a a } - \times 3/5 { + \tuplet 5/3 { a4 a a a a } a4 diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index 3bba0989e7..093c57f289 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc=" Tuplets may be nested." @@ -11,24 +11,24 @@ } \relative c'' { - \times 4/3 { - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } - \times 2/3 { c8[ c c] } + \tuplet 3/4 { + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } } - \times 4/3 { - \times 2/3 { a8[ a a] } - \times 2/3 { a8[ a a] } - \times 2/3 { a8[ a a] } + \tuplet 3/4 { + \tuplet 3/2 { a8[ a a] } + \tuplet 3/2 { a8[ a a] } + \tuplet 3/2 { a8[ a a] } } \override TupletNumber.text = #tuplet-number::calc-fraction-text - \times 4/6 { - \times 2/3 { + \tuplet 6/4 { + \tuplet 3/2 { a4 a a } - \times 3/5 { + \tuplet 5/3 { a4 a a a a } } @@ -36,11 +36,11 @@ s1*1/6 \stemUp - \times 4/6 { - \times 2/3 { + \tuplet 6/4 { + \tuplet 3/2 { a1*1/6 a f' } - \times 3/5 { + \tuplet 5/3 { c f g a b } } diff --git a/input/regression/tuplet-no-stems.ly b/input/regression/tuplet-no-stems.ly index 095bf03ad5..c1c35d8817 100644 --- a/input/regression/tuplet-no-stems.ly +++ b/input/regression/tuplet-no-stems.ly @@ -3,7 +3,7 @@ } -\version "2.17.6" +\version "2.17.11" \layout{ \context{ @@ -19,7 +19,7 @@ } partition = { - \times 2/3 { f8 g a } + \tuplet 3/2 { f8 g a } } diff --git a/input/regression/tuplet-number-outside-staff-positioning.ly b/input/regression/tuplet-number-outside-staff-positioning.ly index f04ffcd154..8cdb353a6d 100644 --- a/input/regression/tuplet-number-outside-staff-positioning.ly +++ b/input/regression/tuplet-number-outside-staff-positioning.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { @@ -13,5 +13,5 @@ positioned above them. \relative c'' { \override TupletBracket.outside-staff-priority = #1 \override TupletNumber.font-size = #5 - \times 2/3 { a4\trill a\trill^"foo" a\trill } + \tuplet 3/2 { a4\trill a\trill^"foo" a\trill } }
\ No newline at end of file diff --git a/input/regression/tuplet-number-outside-staff-priority.ly b/input/regression/tuplet-number-outside-staff-priority.ly index 1e42072978..1a21d0cf77 100644 --- a/input/regression/tuplet-number-outside-staff-priority.ly +++ b/input/regression/tuplet-number-outside-staff-priority.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "Tuplet numbers' outside staff priority can be @@ -8,9 +8,9 @@ set." \relative c'' { \override TupletBracket.avoid-scripts = ##f - \times 2/3 { a8\trill a\trill a\trill } + \tuplet 3/2 { a8\trill a\trill a\trill } \override TupletNumber.outside-staff-priority = #1 - \times 2/3 { a8\trill a\trill a\trill } + \tuplet 3/2 { a8\trill a\trill a\trill } \override Script.outside-staff-priority = #2 - \times 2/3 { a8\trill a\trill a\trill } + \tuplet 3/2 { a8\trill a\trill a\trill } } diff --git a/input/regression/tuplet-number-slur-script.ly b/input/regression/tuplet-number-slur-script.ly index b22f5ee35f..fa92b7cc43 100644 --- a/input/regression/tuplet-number-slur-script.ly +++ b/input/regression/tuplet-number-slur-script.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Tuplet number position is correct when slurs and scripts @@ -10,5 +10,5 @@ are present. { R1 | \break - \times 2/3 { e8(-> e e) } + \tuplet 3/2 { e8(-> e e) } } diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly index 0b2bbd7cdc..f23ccc99d0 100644 --- a/input/regression/tuplet-properties.ly +++ b/input/regression/tuplet-properties.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "Tuplet bracket formatting supports numerous options, @@ -8,31 +8,31 @@ for instance, bracketed (B) and non-bracketed (NB). \context Voice \relative c'' { - \times 2/3 { c'8 c,, c } - \times 2/3 { c'8 c'' c,, } + \tuplet 3/2 { c'8 c,, c } + \tuplet 3/2 { c'8 c'' c,, } - \times 2/3 { c8[^"NB" c c] } + \tuplet 3/2 { c8[^"NB" c c] } - \times 2/3 { c8^"B" c[ c] } - \times 2/4 { r8_"B" c,[ c'] r8 } + \tuplet 3/2 { c8^"B" c[ c] } + \tuplet 4/2 { r8_"B" c,[ c'] r8 } \override TupletBracket.bracket-visibility = #'if-no-beam - \times 2/3 { c8[ c c] } + \tuplet 3/2 { c8[ c c] } \tupletUp \override TupletNumber.stencil = ##f - \times 2/3 { c8^""^""^"up, no digit" c[ c] } + \tuplet 3/2 { c8^""^""^"up, no digit" c[ c] } \revert TupletNumber.stencil \override TupletBracket.bracket-visibility = ##t \override TupletBracket.edge-height = #'(0 . 0) \override TupletBracket.shorten-pair = #'(2.0 . 2.0) - \times 4/6 { c_"shorter, no edges" f b b f c} + \tuplet 6/4 { c_"shorter, no edges" f b b f c} \revert TupletBracket.edge-height \revert TupletBracket.shorten-pair \override TupletBracket.bracket-flare = #'(0.5 . 0.5) - \times 2/3 { b^""^""^"angled edges" b b } + \tuplet 3/2 { b^""^""^"angled edges" b b } \tupletNeutral - \times 2/3 { b b b } + \tuplet 3/2 { b b b } } diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index 14d3364cbc..beda1ec33e 100644 --- a/input/regression/tuplet-rest.ly +++ b/input/regression/tuplet-rest.ly @@ -1,5 +1,5 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Tuplets may contain rests. " @@ -9,14 +9,14 @@ \context Voice \relative c'' { \time 2/4 - \times 2/3 { r c,,, c''' } - \times 2/3 { r c c } - \times 2/3 { r c r } - \times 2/3 { r r r } - \times 2/3 { r c e } - \times 2/3 { c r e } - \times 2/3 { r c g } - \times 2/3 { c r g } + \tuplet 3/2 { r c,,, c''' } + \tuplet 3/2 { r c c } + \tuplet 3/2 { r c r } + \tuplet 3/2 { r r r } + \tuplet 3/2 { r c e } + \tuplet 3/2 { c r e } + \tuplet 3/2 { r c g } + \tuplet 3/2 { c r g } } diff --git a/input/regression/tuplet-single-note.ly b/input/regression/tuplet-single-note.ly index 56509d27af..322a4d635b 100644 --- a/input/regression/tuplet-single-note.ly +++ b/input/regression/tuplet-single-note.ly @@ -4,14 +4,14 @@ texidoc = "Show tuplet numbers also on single-note tuplets (otherwise the timing would look messed up!), but don't show a bracket. Make sure that tuplets without any notes don't show any number, either." } -\version "2.16.0" +\version "2.17.11" \paper { ragged-right = ##t indent = 0.0 } \new Staff << \new Voice \relative c'' { - \times 4/6 { c2.:8 } \times 2/3 { g4.:8 } \times 2/3 { a,4.:8 } \times 4/6 {} \bar"|." + \tuplet 6/4 { c2.:8 } \tuplet 3/2 { g4.:8 } \tuplet 3/2 { a,4.:8 } \tuplet 6/4 {} \bar"|." } >> diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly index cccb4ab56d..c112f0c9af 100644 --- a/input/regression/tuplet-slope.ly +++ b/input/regression/tuplet-slope.ly @@ -15,20 +15,20 @@ The bracket direction is determined by the dominating stem direction. ragged-right = ##t } -\version "2.16.0" +\version "2.17.11" \new Voice { \relative c'' { - \times 2/3 { c4 d e} - \times 2/3 { c4 d e} + \tuplet 3/2 { c4 d e} + \tuplet 3/2 { c4 d e} } \relative c' { - \times 4/5 { a'4 as g fis f } - \times 4/5 { fis4 e es d des } - \times 4/5 { fis,4 e es d des } - \times 4/5 { bes'''4 bes,, b c cis } - \times 4/5 { a''4 b b c cis } + \tuplet 5/4 { a'4 as g fis f } + \tuplet 5/4 { fis4 e es d des } + \tuplet 5/4 { fis,4 e es d des } + \tuplet 5/4 { bes'''4 bes,, b c cis } + \tuplet 5/4 { a''4 b b c cis } } } diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 9ae2b584b1..8729d9747a 100644 --- a/input/regression/tuplet-staffline-collision.ly +++ b/input/regression/tuplet-staffline-collision.ly @@ -1,5 +1,5 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "Horizontal tuplet brackets are shifted vertically @@ -10,9 +10,9 @@ to avoid staff line collisions." \layout { ragged-right= ##t } \context Voice\relative c'' { - \times 2/3 { b'4 b b } - \times 2/3 { f4 f f } - \times 2/3 { g4 g g } - \times 2/3 { a4 a a } + \tuplet 3/2 { b'4 b b } + \tuplet 3/2 { f4 f f } + \tuplet 3/2 { g4 g g } + \tuplet 3/2 { a4 a a } } diff --git a/input/regression/tuplet-subdivision.ly b/input/regression/tuplet-subdivision.ly index 7a3b8b6f45..a8370d35d4 100644 --- a/input/regression/tuplet-subdivision.ly +++ b/input/regression/tuplet-subdivision.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { @@ -12,6 +12,6 @@ Subdivision works properly for tuplets \set baseMoment = #(ly:make-moment 1 8) \set beatStructure = #'(2 2 2 2) \repeat unfold 8 { - \times 2/3 { c16 e d } + \tuplet 3/2 { c16 e d } } } diff --git a/input/regression/tuplet-text-different-numbers.ly b/input/regression/tuplet-text-different-numbers.ly index 5d6dac0cc3..7e01d344db 100644 --- a/input/regression/tuplet-text-different-numbers.ly +++ b/input/regression/tuplet-text-different-numbers.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header{ texidoc="Non-standard tuplet texts: Printing other tuplet fractions than the ones actually assigned." } @@ -7,9 +7,9 @@ \context Voice \relative c'' { \once \override TupletNumber.text = #(tuplet-number::non-default-tuplet-denominator-text 7) - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } \once \override TupletNumber.text = #(tuplet-number::non-default-tuplet-fraction-text 12 7) - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } \once \override TupletNumber.text = #(tuplet-number::append-note-wrapper (tuplet-number::non-default-tuplet-fraction-text 12 7) "8") - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } } diff --git a/input/regression/tuplet-text-fraction-with-notes.ly b/input/regression/tuplet-text-fraction-with-notes.ly index acf002a896..9a63ebdf45 100644 --- a/input/regression/tuplet-text-fraction-with-notes.ly +++ b/input/regression/tuplet-text-fraction-with-notes.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header{ texidoc="Non-standard tuplet texts: Printing a tuplet fraction with note durations assigned to both the denominator and the numerator." } @@ -6,7 +6,7 @@ \context Voice \relative c'' { \once \override TupletNumber.text = #(tuplet-number::fraction-with-notes "4." "8") - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } \once \override TupletNumber.text = #(tuplet-number::non-default-fraction-with-notes 12 "8" 4 "4") - \times 2/3 { c4. c4. c4. c4. } + \tuplet 3/2 { c4. c4. c4. c4. } } diff --git a/input/regression/tuplet-text-note-appended.ly b/input/regression/tuplet-text-note-appended.ly index aba3734726..c29e1f1997 100644 --- a/input/regression/tuplet-text-note-appended.ly +++ b/input/regression/tuplet-text-note-appended.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header{ texidoc="Non-standard tuplet texts: Appending a note value to the normal text and to the fraction text." } @@ -7,7 +7,7 @@ \context Voice \relative c'' { \once \override TupletNumber.text = #(tuplet-number::append-note-wrapper tuplet-number::calc-denominator-text "4") - \times 2/3 { c8 c8 c8 c8 c8 c8 } + \tuplet 3/2 { c8 c8 c8 c8 c8 c8 } \once \override TupletNumber.text = #(tuplet-number::append-note-wrapper tuplet-number::calc-fraction-text "4") - \times 2/3 { c8 c8 c8 c8 c8 c8 } + \tuplet 3/2 { c8 c8 c8 c8 c8 c8 } } diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index 97cfe1491e..c250c5bea4 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.17.11" \header{ texidoc=" @@ -20,16 +20,16 @@ direction as the bracket. The endings can be adjusted with \context Voice \relative c'' { - \times 2/3 { a8 b c } - \times 2/3 { r8 b[ f] } + \tuplet 3/2 { a8 b c } + \tuplet 3/2 { r8 b[ f] } \override TupletBracket.bracket-flare = #'(0.5 . 0.5) - \times 2/3 { r8 b r8 } + \tuplet 3/2 { r8 b r8 } c4 | - \times 3/4 { c4 c4 c4 c4 } c4 | + \tuplet 4/3 { c4 c4 c4 c4 } c4 | \time 6/8 - \times 6/9 { c8 c c c c c c c c } + \tuplet 9/6 { c8 c c c c c c c c } } |