From: David Kastrup Date: Tue, 29 Mar 2016 06:02:00 +0000 (+0200) Subject: Run scripts/auxiliar/update-with-convert-ly.sh X-Git-Tag: release/2.19.40-1~11^2~9 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=3ecc98aa5db8a47adcf9defc4ec9fc018c5cc47d Run scripts/auxiliar/update-with-convert-ly.sh --- diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely index c73fae7ef3..a87acd3a5d 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.19.22" +@c \version "2.19.40" @c Translators: Till Paala @@ -1142,7 +1142,7 @@ werden. \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1186,7 +1186,7 @@ Noten in dem Kontext befinen müssen, bevor \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 c8^\markup {"Beamed (2 2)"} @@ -1195,7 +1195,7 @@ Noten in dem Kontext befinen müssen, bevor \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 c8^\markup {"Beamed (3 1)"} @@ -1221,7 +1221,7 @@ Standard zurückgesetzt werden: \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1244,7 +1244,7 @@ Notensysteme können eingerichtet werden, indem man den \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -1253,7 +1253,7 @@ Notensysteme können eingerichtet werden, indem man den \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(1 3) % beatStructure + 1,3 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -2166,9 +2166,9 @@ einzelner Taktschlag. @lilypond[quote,relative=2,verbatim] \time 5/16 c16^"default" c c c c | -\set Timing.beatStructure = #'(2 3) +\set Timing.beatStructure = 2,3 c16^"(2+3)" c c c c | -\set Timing.beatStructure = #'(3 2) +\set Timing.beatStructure = 3,2 c16^"(3+2)" c c c c | @end lilypond @@ -2182,12 +2182,12 @@ werden, wenn die Bebalkung von @code{beatStructure} bestimmt werden soll. a8^"default" a a a a a a a \set Timing.baseMoment = #(ly:make-moment 1/4) -\set Timing.beatStructure = #'(1 1 1 1) +\set Timing.beatStructure = 1,1,1,1 a8^"no change" a a a a a a a \set Timing.beamExceptions = #'() \set Timing.baseMoment = #(ly:make-moment 1/4) -\set Timing.beatStructure = #'(1 1 1 1) +\set Timing.beatStructure = 1,1,1,1 a8^"changed" a a a a a a a @end lilypond @@ -2199,7 +2199,7 @@ niedrigere befindet. @lilypond[quote, verbatim,relative=1] \new Staff << \time 7/8 - \set Staff.beatStructure = #'(2 3 2) + \set Staff.beatStructure = 2,3,2 \new Voice = one { \relative { a'8 a a a a a a @@ -2208,7 +2208,7 @@ niedrigere befindet. \new Voice = two { \relative { \voiceTwo - \set Voice.beatStructure = #'(1 3 3) + \set Voice.beatStructure = 1,3,3 f'8 f f f f f f } } @@ -2225,11 +2225,11 @@ Systems angewendet werden sollen: % Context applied to Voice by dafault -- does not work correctly % Because of autogenerated voices, all beating will % be at baseMoment (1 . 8) -\set beatStructure = #'(3 1 1 2) +\set beatStructure = 3,1,1,2 << {a8 a a a16 a a a a8 a} \\ {f4. f8 f f f} >> % Works correctly with context Staff specified -\set Staff.beatStructure = #'(3 1 1 2) +\set Staff.beatStructure = 3,1,1,2 << {a8 a a a16 a a a a8 a} \\ {f4. f8 f f f} >> @end lilypond @@ -2241,7 +2241,7 @@ er kompatibel mit dem neuen Wert von @code{baseMoment} ist. @lilypond[quote,verbatim,relative=2] \time 5/8 \set Timing.baseMoment = #(ly:make-moment 1/16) -\set Timing.beatStructure = #'(7 3) +\set Timing.beatStructure = 7,3 \repeat unfold 10 { a16 } @end lilypond @@ -2262,7 +2262,7 @@ definiert. @lilypond[quote,relative=2,verbatim] \time 3/16 -\set Timing.beatStructure = #'(2 1) +\set Timing.beatStructure = 2,1 \set Timing.beamExceptions = #'( ;start of alist (end . ;entry for end of beams @@ -2314,7 +2314,7 @@ definiert wird, werden die automatischen Bebalkungsregeln für den \time 6/8 \repeat unfold 6 { a8 } % group (4 + 2) - \set Timing.beatStructure = #'(4 2) + \set Timing.beatStructure = 4,2 \repeat unfold 6 { a8 } % go back to default behavior \time 6/8 @@ -2336,7 +2336,7 @@ Die @code{beamExceptions}-Regel kann die @code{beatStructure}-Einstellung @lilypond[quote,verbatim,fragment] \time 4/4 \set Timing.baseMoment = #(ly:make-moment 1/8) -\set Timing.beatStructure = #'(3 3 2) +\set Timing.beatStructure = 3,3,2 % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c''8} | % This will beam (3 3 2) because we clear beamExceptions @@ -2476,7 +2476,7 @@ vermeiden, ist es, die Taktart nur in einem System zu setzen. \new Staff { \time 3/4 \set Timing.baseMoment = #(ly:make-moment 1/8) - \set Timing.beatStructure = #'(1 5) + \set Timing.beatStructure = 1,5 \repeat unfold 6 { a8 } } \new Staff { @@ -2496,7 +2496,7 @@ der automatischen Bebalkungsregeln für eine Taktart sind in \overrideTimeSignatureSettings 3/4 % timeSignatureFraction 1/8 % baseMomentFraction - #'(1 5) % beatStructure + 1,5 % beatStructure #'() % beamExceptions \time 3/4 \repeat unfold 6 { a'8 } diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely index effa27d144..7a2c6a24e2 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.19.22" +@c \version "2.19.40" @node Duraciones @section Duraciones @@ -1177,9 +1177,9 @@ escribiéndolo como primer argumento opcional: \score { \new Staff { \relative { - \time #'(2 2 3) 7/8 + \time 2,2,3 7/8 \repeat unfold 7 { c'8 } | - \time #'(3 2 2) 7/8 + \time 3,2,2 7/8 \repeat unfold 7 { c8 } | } } @@ -1201,7 +1201,7 @@ con el mismo valor del tipo de compás: \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1250,7 +1250,7 @@ tipo de compás se pueden restaurar a los valores originales: \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1274,7 +1274,7 @@ contexto @code{Staff}. \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -1283,7 +1283,7 @@ contexto @code{Staff}. \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(1 3) % beatStructure + 1,3 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -2265,9 +2265,9 @@ establecerse. % beamExceptions are unlikely to be defined for 5/16 time, % but let's disable them anyway to be sure \set Timing.beamExceptions = #'() - \set Timing.beatStructure = #'(2 3) + \set Timing.beatStructure = 2,3 c16^"(2+3)" c c c c | - \set Timing.beatStructure = #'(3 2) + \set Timing.beatStructure = 3,2 c16^"(3+2)" c c c c | } @end lilypond @@ -2280,7 +2280,7 @@ establecerse. % defined for 4/4 time \set Timing.beamExceptions = #'() \set Timing.baseMoment = #(ly:make-moment 1/4) - \set Timing.beatStructure = #'(1 1 1 1) + \set Timing.beatStructure = 1,1,1,1 a8^"changed" a a a a a a a } @end lilypond @@ -2295,7 +2295,7 @@ circundante. \time 7/8 % No need to disable beamExceptions % as they are not defined for 7/8 time - \set Staff.beatStructure = #'(2 3 2) + \set Staff.beatStructure = 2,3,2 << \new Voice = one { \relative { @@ -2305,7 +2305,7 @@ circundante. \new Voice = two { \relative { \voiceTwo - \set Voice.beatStructure = #'(1 3 3) + \set Voice.beatStructure = 1,3,3 f'8 f f f f f f } } @@ -2323,11 +2323,11 @@ pentagrama: % Change applied to Voice by default -- does not work correctly % Because of autogenerated voices, all beating will % be at baseMoment (1 . 8) -\set beatStructure = #'(3 1 1 2) +\set beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> % Works correctly with context Staff specified -\set Staff.beatStructure = #'(3 1 1 2) +\set Staff.beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> @end lilypond @@ -2341,7 +2341,7 @@ compatible con el nuevo valor de @code{baseMoment}. % No need to disable beamExceptions % as they are not defined for 5/8 time \set Timing.baseMoment = #(ly:make-moment 1/16) -\set Timing.beatStructure = #'(7 3) +\set Timing.beatStructure = 7,3 \repeat unfold 10 { a'16 } @end lilypond @@ -2373,7 +2373,7 @@ discernir la longitud del compás). He aquí un ejemplo sencillo: @lilypond[quote,verbatim] \relative c'' { \time 3/16 - \set Timing.beatStructure = #'(2 1) + \set Timing.beatStructure = 2,1 \set Timing.beamExceptions = \beamExceptions { 32[ 32] 32[ 32] 32[ 32] } c16 c c | @@ -2400,7 +2400,7 @@ para el contexto @code{Timing} al comportamiento predeterminado. \time 6/8 \repeat unfold 6 { a8 } % group (4 + 2) - \set Timing.beatStructure = #'(4 2) + \set Timing.beatStructure = 4,2 \repeat unfold 6 { a8 } % go back to default behavior \time 6/8 @@ -2424,7 +2424,7 @@ ajuste @code{beatStructure} si no se reinicia @lilypond[quote,verbatim,fragment] \time 4/4 \set Timing.baseMoment = #(ly:make-moment 1/8) -\set Timing.beatStructure = #'(3 3 2) +\set Timing.beatStructure = 3,3,2 % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c''8} | % This will beam (3 3 2) because we clear beamExceptions @@ -2568,7 +2568,7 @@ solamente. \new Staff { \time 3/4 \set Timing.baseMoment = #(ly:make-moment 1/8) - \set Timing.beatStructure = #'(1 5) + \set Timing.beatStructure = 1,5 \set Timing.beamExceptions = #'() \repeat unfold 6 { a'8 } } @@ -2590,7 +2590,7 @@ barrado automático para una indicación de compás se describe en \overrideTimeSignatureSettings 3/4 % timeSignatureFraction 1/8 % baseMomentFraction - #'(1 5) % beatStructure + 1,5 % beatStructure #'() % beamExceptions \time 3/4 \repeat unfold 6 { a'8 } diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely index f8d4b13ddd..1c6bc517e2 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.19.22" +@c \version "2.19.40" @c Translators: Frédéric Chiasson, Jean-Charles Malahieude @c Translation checkers: Valentin Villenave, François Martin, Xavier Scheuer @@ -1167,9 +1167,9 @@ la commande @code{\time} à l'aide d'un premier argument : \score { \new Staff { \relative { - \time #'(2 2 3) 7/8 + \time 2,2,3 7/8 \repeat unfold 7 { c'8 } | - \time #'(3 2 2) 7/8 + \time 3,2,2 7/8 \repeat unfold 7 { c8 } | } } @@ -1189,7 +1189,7 @@ de métrique correspondante : \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1234,7 +1234,7 @@ métrique : \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1257,7 +1257,7 @@ particuliers pour les différentes portées d'un regroupement : \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -1266,7 +1266,7 @@ particuliers pour les différentes portées d'un regroupement : \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(1 3) % beatStructure + 1,3 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -2233,9 +2233,9 @@ vigueur et ré-instaurées si cette métrique réapparaît plus tard. % beamExceptions are unlikely to be defined for 5/16 time, % but let's disable them anyway to be sure \set Timing.beamExceptions = #'() - \set Timing.beatStructure = #'(2 3) + \set Timing.beatStructure = 2,3 c16^"(2+3)" c c c c | - \set Timing.beatStructure = #'(3 2) + \set Timing.beatStructure = 3,2 c16^"(3+2)" c c c c | } @end lilypond @@ -2248,7 +2248,7 @@ vigueur et ré-instaurées si cette métrique réapparaît plus tard. % defined for 4/4 time \set Timing.beamExceptions = #'() \set Timing.baseMoment = #(ly:make-moment 1/4) - \set Timing.beatStructure = #'(1 1 1 1) + \set Timing.beatStructure = 1,1,1,1 a8^"changed" a a a a a a a } @end lilypond @@ -2263,7 +2263,7 @@ supérieur s'appliqueront. \time 7/8 % No need to disable beamExceptions % as they are not defined for 7/8 time - \set Staff.beatStructure = #'(2 3 2) + \set Staff.beatStructure = 2,3,2 << \new Voice = one { \relative { @@ -2273,7 +2273,7 @@ supérieur s'appliqueront. \new Voice = two { \relative { \voiceTwo - \set Voice.beatStructure = #'(1 3 3) + \set Voice.beatStructure = 1,3,3 f'8 f f f f f f } } @@ -2291,11 +2291,11 @@ ces règles affectent le contexte @code{Staff} : % Change applied to Voice by default -- does not work correctly % Because of autogenerated voices, all beating will % be at baseMoment (1 . 8) -\set beatStructure = #'(3 1 1 2) +\set beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> % Works correctly with context Staff specified -\set Staff.beatStructure = #'(3 1 1 2) +\set Staff.beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> @end lilypond @@ -2309,7 +2309,7 @@ valeur de @code{baseMoment}. % No need to disable beamExceptions % as they are not defined for 5/8 time \set Timing.baseMoment = #(ly:make-moment 1/16) -\set Timing.beatStructure = #'(7 3) +\set Timing.beatStructure = 7,3 \repeat unfold 10 { a'16 } @end lilypond @@ -2341,7 +2341,7 @@ ligatures sont gérées par la propriété @code{beamExceptions}. @lilypond[quote,verbatim] \relative c'' { \time 3/16 - \set Timing.beatStructure = #'(2 1) + \set Timing.beatStructure = 2,1 \set Timing.beamExceptions = \beamExceptions { 32[ 32] 32[ 32] 32[ 32] } c16 c c | @@ -2366,7 +2366,7 @@ de spécifier à nouveau la métrique. \time 6/8 \repeat unfold 6 { a8 } % group (4 + 2) - \set Timing.beatStructure = #'(4 2) + \set Timing.beatStructure = 4,2 \repeat unfold 6 { a8 } % go back to default behavior \time 6/8 @@ -2389,7 +2389,7 @@ de cette dérogation. @lilypond[quote,verbatim,fragment] \time 4/4 \set Timing.baseMoment = #(ly:make-moment 1/8) -\set Timing.beatStructure = #'(3 3 2) +\set Timing.beatStructure = 3,3,2 % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c''8} | % This will beam (3 3 2) because we clear beamExceptions @@ -2530,7 +2530,7 @@ métrique que dans une seule portée. \new Staff { \time 3/4 \set Timing.baseMoment = #(ly:make-moment 1/8) - \set Timing.beatStructure = #'(1 5) + \set Timing.beatStructure = 1,5 \set Timing.beamExceptions = #'() \repeat unfold 6 { a'8 } } @@ -2551,7 +2551,7 @@ ligature automatiques est abordée au chapitre @ref{Métrique}. \overrideTimeSignatureSettings 3/4 % timeSignatureFraction 1/8 % baseMomentFraction - #'(1 5) % beatStructure + 1,5 % beatStructure #'() % beamExceptions \time 3/4 \repeat unfold 6 { a'8 } diff --git a/Documentation/it/learning/templates.itely b/Documentation/it/learning/templates.itely index 0e7a24c21d..b8e700d79f 100644 --- a/Documentation/it/learning/templates.itely +++ b/Documentation/it/learning/templates.itely @@ -583,7 +583,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print @ The `line-width' is for \header. @li lypond[quote,verbatim,ragged-right,line-width] -\version "2.19.2" +\version "2.19.25" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/it/notation/rhythms.itely b/Documentation/it/notation/rhythms.itely index 216dd8e74d..f39751159a 100644 --- a/Documentation/it/notation/rhythms.itely +++ b/Documentation/it/notation/rhythms.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.19.22" +@c \version "2.19.40" @c Translators: Federico Bruni @c Translation checkers: Luca Rossetto Casel @@ -1140,9 +1140,9 @@ Si può sovrascrivere il valore predefinito di @code{beatStructure} nel comando \score { \new Staff { \relative { - \time #'(2 2 3) 7/8 + \time 2,2,3 7/8 \repeat unfold 7 { c'8 } | - \time #'(3 2 2) 7/8 + \time 3,2,2 7/8 \repeat unfold 7 { c8 } | } } @@ -1163,7 +1163,7 @@ specificata nelle nuove impostazioni: \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1209,7 +1209,7 @@ essere ripristinati ai valori originali: \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1232,7 +1232,7 @@ di tempo per righi diversi spostando @code{Timing_translator} e \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -1241,7 +1241,7 @@ di tempo per righi diversi spostando @code{Timing_translator} e \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(1 3) % beatStructure + 1,3 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -2198,9 +2198,9 @@ tempo viene ristabilita. % È improbabile che per un tempo di 5/16 sia stata definita beamExceptions, % ma disabilitiamola lo stesso per sicurezza \set Timing.beamExceptions = #'() - \set Timing.beatStructure = #'(2 3) + \set Timing.beatStructure = 2,3 c16^"(2+3)" c c c c | - \set Timing.beatStructure = #'(3 2) + \set Timing.beatStructure = 3,2 c16^"(3+2)" c c c c | } @end lilypond @@ -2214,7 +2214,7 @@ tempo viene ristabilita. % per il tempo 4/4 \set Timing.beamExceptions = #'() \set Timing.baseMoment = #(ly:make-moment 1/4) - \set Timing.beatStructure = #'(1 1 1 1) + \set Timing.beatStructure = 1,1,1,1 a8^"cambiato" a a a a a a a } @end lilypond @@ -2229,7 +2229,7 @@ contiene. \time 7/8 % Nessun bisogno di disabilitare beamExceptions perché non è definita per il tempo 7/8 - \set Staff.beatStructure = #'(2 3 2) + \set Staff.beatStructure = 2,3,2 << \new Voice = one { \relative { @@ -2239,7 +2239,7 @@ contiene. \new Voice = two { \relative { \voiceTwo - \set Voice.beatStructure = #'(1 3 3) + \set Voice.beatStructure = 1,3,3 f'8 f f f f f f } } @@ -2256,11 +2256,11 @@ rigo: % ritmo 3-1-1-2 % Se non si specifica il contesto, la modifica viene applicata a Voice e quindi non funziona correttamente % Dato che le voci sono autogenerate, tutto il ritmo avrà come baseMoment (1 . 8) -\set beatStructure = #'(3 1 1 2) +\set beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> % Funziona correttamente se si specifica il contesto Staff -\set Staff.beatStructure = #'(3 1 1 2) +\set Staff.beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> @end lilypond @@ -2273,7 +2273,7 @@ compatibile col nuovo valore di @code{baseMoment}. \time 5/8 % Nessun bisogno di disabilitare beamExceptions perché non è definita per il tempo 5/8 \set Timing.baseMoment = #(ly:make-moment 1/16) -\set Timing.beatStructure = #'(7 3) +\set Timing.beatStructure = 7,3 \repeat unfold 10 { a16 } @end lilypond @@ -2302,7 +2302,7 @@ modo per determinare la lunghezza della misura. Ecco un semplice esempio: @lilypond[quote,verbatim] \relative c'' { \time 3/16 - \set Timing.beatStructure = #'(2 1) + \set Timing.beatStructure = 2,1 \set Timing.beamExceptions = \beamExceptions { 32[ 32] 32[ 32] 32[ 32] } c16 c c | @@ -2328,7 +2328,7 @@ ai valori predefiniti. \time 6/8 \repeat unfold 6 { a8 } % raggruppamento (4 + 2) - \set Timing.beatStructure = #'(4 2) + \set Timing.beatStructure = 4,2 \repeat unfold 6 { a8 } % ritorno al comportamento predefinito \time 6/8 @@ -2349,7 +2349,7 @@ se @code{beamExceptions} non viene annullato. @lilypond[quote,verbatim,fragment] \time 4/4 \set Timing.baseMoment = #(ly:make-moment 1/8) -\set Timing.beatStructure = #'(3 3 2) +\set Timing.beatStructure = 3,3,2 % Le travature non saranno raggruppate in (3 3 2) a causa di beamExceptions \repeat unfold 8 {c8} | % Il raggruppamento delle travature è (3 3 2) perché abbiamo tolto le impostazioni predefinite di beamExceptions @@ -2486,7 +2486,7 @@ un solo rigo. \new Staff { \time 3/4 \set Timing.baseMoment = #(ly:make-moment 1/8) - \set Timing.beatStructure = #'(1 5) + \set Timing.beatStructure = 1,5 \set Timing.beamExceptions = #'() \repeat unfold 6 { a'8 } } @@ -2507,7 +2507,7 @@ descritte in @ref{Time signature}. \overrideTimeSignatureSettings 3/4 % timeSignatureFraction 1/8 % baseMomentFraction - #'(1 5) % beatStructure + 1,5 % beatStructure #'() % beamExceptions \time 3/4 \repeat unfold 6 { a'8 } diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely index 311a31aad6..79127b122d 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.19.22" +@c \version "2.19.40" @c Translators: Yoshiki Sawada @c Translation status: post-GDP @@ -1118,7 +1118,7 @@ R1^"right" \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1163,7 +1163,7 @@ R1^"right" \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 c8^\markup {"Beamed (2 2)"} @@ -1172,7 +1172,7 @@ R1^"right" \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 c8^\markup {"Beamed (3 1)"} @@ -1194,7 +1194,7 @@ R1^"right" \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1216,7 +1216,7 @@ R1^"right" \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -1225,7 +1225,7 @@ R1^"right" \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(1 3) % beatStructure + 1,3 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -2107,9 +2107,9 @@ cis4 d cis! d @lilypond[quote,relative=2,verbatim] \time 5/16 c16^"default" c c c c | -\set Timing.beatStructure = #'(2 3) +\set Timing.beatStructure = 2,3 c16^"(2+3)" c c c c | -\set Timing.beatStructure = #'(3 2) +\set Timing.beatStructure = 3,2 c16^"(3+2)" c c c c | @end lilypond @@ -2120,7 +2120,7 @@ c16^"(3+2)" c c c c | @lilypond[quote, verbatim,relative=1] \new Staff { \time 7/8 - \set Staff.beatStructure = #'(2 3 2) + \set Staff.beatStructure = 2,3,2 << \new Voice = one { \relative { @@ -2130,7 +2130,7 @@ c16^"(3+2)" c c c c | \new Voice = two { \relative { \voiceTwo - \set Voice.beatStructure = #'(1 3 3) + \set Voice.beatStructure = 1,3,3 f'8 f f f f f f } } @@ -2148,11 +2148,11 @@ c16^"(3+2)" c c c c | % リズム 3-1-1-2 % デフォルトで連桁設定の変更は Voice に適用され、うまくいきません % なぜなら、自動生成されるボイスで、すべての拍は baseMoment (1 . 8) だからです -\set beatStructure = #'(3 1 1 2) +\set beatStructure = 3,1,1,2 << {a8 a a a16 a a a a8 a} \\ {f4. f8 f f f} >> % コンテキスト Staff を指定するとうまくいきます -\set Staff.beatStructure = #'(3 1 1 2) +\set Staff.beatStructure = 3,1,1,2 << {a8 a a a16 a a a a8 a} \\ {f4. f8 f f f} >> @end lilypond @@ -2165,7 +2165,7 @@ c16^"(3+2)" c c c c | @lilypond[quote,verbatim,relative=2] \time 5/8 \set Timing.baseMoment = #(ly:make-moment 1/16) -\set Timing.beatStructure = #'(7 3) +\set Timing.beatStructure = 7,3 \repeat unfold 10 { a16 } @end lilypond @@ -2183,7 +2183,7 @@ Scheme 関数 @code{ly:make-moment} によって作り出されます。@c @c 未訳 @lilypond[quote,relative=2,verbatim] \time 3/16 -\set Timing.beatStructure = #'(2 1) +\set Timing.beatStructure = 2,1 \set Timing.beamExceptions = #'( ;start of alist (end . ;entry for end of beams @@ -2229,7 +2229,7 @@ c16 c c | \time 6/8 \repeat unfold 6 { a8 } % (4 + 2) にグループ化します -\set Timing.beatStructure = #'(4 2) +\set Timing.beatStructure = 4,2 \repeat unfold 6 { a8 } % デフォルトの振る舞いに戻ります \time 6/8 @@ -2252,7 +2252,7 @@ c16 c c | @lilypond[quote,verbatim,relative=2] \time 4/4 \set Timing.baseMoment = #(ly:make-moment 1/8) -\set Timing.beatStructure = #'(3 3 2) +\set Timing.beatStructure = 3,3,2 % 以下は beamExceptions のため、(3 3 2) の連桁にはなりません \repeat unfold 8 {c8} | % 以下は beamExceptions をクリアするため、(3 3 2) の連桁になります @@ -2390,7 +2390,7 @@ c16 c c | \new Staff { \time 3/4 \set Timing.baseMoment = #(ly:make-moment 1/8) - \set Timing.beatStructure = #'(1 5) + \set Timing.beatStructure = 1,5 \repeat unfold 6 { a8 } } \new Staff { @@ -2409,7 +2409,7 @@ c16 c c | \overrideTimeSignatureSettings 3/4 % timeSignatureFraction 1/8 % baseMomentFraction - #'(1 5) % beatStructure + 1,5 % beatStructure #'() % beamExceptions \time 3/4 \repeat unfold 6 { a'8 } diff --git a/Documentation/ly-examples/granados.ly b/Documentation/ly-examples/granados.ly index 371c63a022..9f4cf10301 100644 --- a/Documentation/ly-examples/granados.ly +++ b/Documentation/ly-examples/granados.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.40" \include "example-header.ily" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -45,7 +45,7 @@ upperVoiceOne = \relative { 8\([ \tuplet 5/4{32( aes' g f g]) } \set subdivideBeams = ##t \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2) + \set beatStructure = 2,2,2 16 \tuplet 5/4{ bes'32( c bes aes bes]) } \set subdivideBeams = ##f \ottava #1 16 \appoggiatura f8 16\) @@ -90,7 +90,7 @@ lowerVoiceOne = \relative { \csl \stemUp \set subdivideBeams = ##t \set baseMoment = #(ly:make-moment 1/16) - \set beatStructure = #'(4 4 4) + \set beatStructure = 4,4,4 s8 \hideNotes \slurUp \stemDown es,,64( bes'' s64 \unHideNotes \stemUp g64[ bes c d c]) s2 \set subdivideBeams = ##f diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index 9f0adb7741..27241d8fde 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.19.22" +@c \version "2.19.40" @node Rhythms @section Rhythms @@ -1127,9 +1127,9 @@ argument: \score { \new Staff { \relative { - \time #'(2 2 3) 7/8 + \time 2,2,3 7/8 \repeat unfold 7 { c'8 } | - \time #'(3 2 2) 7/8 + \time 3,2,2 7/8 \repeat unfold 7 { c8 } | } } @@ -1150,7 +1150,7 @@ signature is executed: \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1196,7 +1196,7 @@ to the original values: \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 { c8 } | @@ -1219,7 +1219,7 @@ for different staves by moving the @code{Timing_translator} and the \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -1228,7 +1228,7 @@ for different staves by moving the @code{Timing_translator} and the \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(1 3) % beatStructure + 1,3 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -2174,9 +2174,9 @@ is re-established. % beamExceptions are unlikely to be defined for 5/16 time, % but let's disable them anyway to be sure \set Timing.beamExceptions = #'() - \set Timing.beatStructure = #'(2 3) + \set Timing.beatStructure = 2,3 c16^"(2+3)" c c c c | - \set Timing.beatStructure = #'(3 2) + \set Timing.beatStructure = 3,2 c16^"(3+2)" c c c c | } @end lilypond @@ -2189,7 +2189,7 @@ is re-established. % defined for 4/4 time \set Timing.beamExceptions = #'() \set Timing.baseMoment = #(ly:make-moment 1/4) - \set Timing.beatStructure = #'(1 1 1 1) + \set Timing.beatStructure = 1,1,1,1 a8^"changed" a a a a a a a } @end lilypond @@ -2203,7 +2203,7 @@ enclosing context will apply. \time 7/8 % No need to disable beamExceptions % as they are not defined for 7/8 time - \set Staff.beatStructure = #'(2 3 2) + \set Staff.beatStructure = 2,3,2 << \new Voice = one { \relative { @@ -2213,7 +2213,7 @@ enclosing context will apply. \new Voice = two { \relative { \voiceTwo - \set Voice.beatStructure = #'(1 3 3) + \set Voice.beatStructure = 1,3,3 f'8 f f f f f f } } @@ -2231,11 +2231,11 @@ staff: % Change applied to Voice by default -- does not work correctly % Because of autogenerated voices, all beating will % be at baseMoment (1 . 8) -\set beatStructure = #'(3 1 1 2) +\set beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> % Works correctly with context Staff specified -\set Staff.beatStructure = #'(3 1 1 2) +\set Staff.beatStructure = 3,1,1,2 << \relative {a'8 a a a16 a a a a8 a} \\ \relative {f'4. f8 f f f} >> @end lilypond @@ -2249,7 +2249,7 @@ compatible with the new value of @code{baseMoment}. % No need to disable beamExceptions % as they are not defined for 5/8 time \set Timing.baseMoment = #(ly:make-moment 1/16) -\set Timing.beatStructure = #'(7 3) +\set Timing.beatStructure = 7,3 \repeat unfold 10 { a'16 } @end lilypond @@ -2278,7 +2278,7 @@ a simple example: @lilypond[quote,verbatim] \relative c'' { \time 3/16 - \set Timing.beatStructure = #'(2 1) + \set Timing.beatStructure = 2,1 \set Timing.beamExceptions = \beamExceptions { 32[ 32] 32[ 32] 32[ 32] } c16 c c | @@ -2304,7 +2304,7 @@ context to the default behavior. \time 6/8 \repeat unfold 6 { a8 } % group (4 + 2) - \set Timing.beatStructure = #'(4 2) + \set Timing.beatStructure = 4,2 \repeat unfold 6 { a8 } % go back to default behavior \time 6/8 @@ -2326,7 +2326,7 @@ if @code{beamExceptions} is not reset. @lilypond[quote,verbatim,fragment] \time 4/4 \set Timing.baseMoment = #(ly:make-moment 1/8) -\set Timing.beatStructure = #'(3 3 2) +\set Timing.beatStructure = 3,3,2 % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c''8} | % This will beam (3 3 2) because we clear beamExceptions @@ -2464,7 +2464,7 @@ in only one staff. \new Staff { \time 3/4 \set Timing.baseMoment = #(ly:make-moment 1/8) - \set Timing.beatStructure = #'(1 5) + \set Timing.beatStructure = 1,5 \set Timing.beamExceptions = #'() \repeat unfold 6 { a'8 } } @@ -2485,7 +2485,7 @@ beaming settings for a time signature are described in \overrideTimeSignatureSettings 3/4 % timeSignatureFraction 1/8 % baseMomentFraction - #'(1 5) % beatStructure + 1,5 % beatStructure #'() % beamExceptions \time 3/4 \repeat unfold 6 { a'8 } diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly index ae63f423c2..926a1729e5 100644 --- a/Documentation/snippets/automatic-beam-subdivisions.ly +++ b/Documentation/snippets/automatic-beam-subdivisions.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.40" \header { lsrtags = "automatic-notation, connecting-notes, rhythms" @@ -35,10 +35,10 @@ specified in @code{baseMoment}). >> \oneVoice \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 b32^"baseMoment 1 8"[ a g f c' b a g] \set baseMoment = #(ly:make-moment 1/16) - \set beatStructure = #'(4 4 4 4) + \set beatStructure = 4,4,4,4 b32^"baseMoment 1 16"[ a g f c' b a g] } } diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly index be7e458d63..c517b35ecf 100644 --- a/Documentation/snippets/beam-endings-in-score-context.ly +++ b/Documentation/snippets/beam-endings-in-score-context.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.40" \header { lsrtags = "rhythms" @@ -22,14 +22,14 @@ levels: \time 5/4 % Set default beaming for all staves \set Score.baseMoment = #(ly:make-moment 1/8) - \set Score.beatStructure = #'(3 4 3) + \set Score.beatStructure = 3,4,3 << \new Staff { c8 c c c c c c c c c } \new Staff { % Modify beaming for just this staff - \set Staff.beatStructure = #'(6 4) + \set Staff.beatStructure = 6,4 c8 c c c c c c c c c } \new Staff { @@ -42,7 +42,7 @@ levels: % Modify beaming for this voice only \new Voice { \voiceTwo - \set Voice.beatStructure = #'(6 4) + \set Voice.beatStructure = 6,4 a8 a a a a a a a a a } >> diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly index 060b3faf2a..eea44b0fbc 100644 --- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly +++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.40" \header { lsrtags = "rhythms" @@ -38,9 +38,9 @@ setting in @code{scm/time-signature-settings.scm}: \new Voice \relative c'' { \time 9/8 g8 g d d g g a( bes g) | - \set Timing.beatStructure = #'(2 2 2 3) + \set Timing.beatStructure = 2,2,2,3 g8 g d d g g a( bes g) | - \time #'(4 5) 9/8 + \time 4,5 9/8 g8 g d d g g a( bes g) | \time 5/8 a4. g4 | diff --git a/Documentation/snippets/new/subdividing-beams.ly b/Documentation/snippets/new/subdividing-beams.ly index 0030c5a1cb..bd19413306 100644 --- a/Documentation/snippets/new/subdividing-beams.ly +++ b/Documentation/snippets/new/subdividing-beams.ly @@ -1,4 +1,4 @@ -\version "2.19.34" +\version "2.19.40" \header { lsrtags = "rhythms" @@ -33,22 +33,22 @@ changed to match the new @code{baseMoment}: % Set beam sub-group length to an eighth note \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 c32[ c c c c c c c] % Set beam sub-group length to a sixteenth note \set baseMoment = #(ly:make-moment 1/16) - \set beatStructure = #'(4 4 4 4) + \set beatStructure = 4,4,4,4 c32[ c c c c c c c] % Shorten beam by 1/32 \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 c32[ c c c c c c] r32 % Shorten beam by 3/32 \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 c32[ c c c c] r16. r2 } diff --git a/Documentation/snippets/reverting-default-beam-endings.ly b/Documentation/snippets/reverting-default-beam-endings.ly index bf28390f9f..b5f90ce205 100644 --- a/Documentation/snippets/reverting-default-beam-endings.ly +++ b/Documentation/snippets/reverting-default-beam-endings.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.18.0" +\version "2.19.40" \header { lsrtags = "rhythms, version-specific" @@ -25,6 +25,6 @@ new beaming endings: a8 a a a a a a a a a a a % Set new values for beam endings - \set Score.beatStructure = #'(3 4 3 2) + \set Score.beatStructure = 3,4,3,2 a8 a a a a a a a a a a a } diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly index e73800041a..ff33889da5 100644 --- a/Documentation/snippets/subdividing-beams.ly +++ b/Documentation/snippets/subdividing-beams.ly @@ -5,7 +5,7 @@ % % This file is in the public domain. %% Note: this file works from version 2.19.34 -\version "2.19.34" +\version "2.19.40" \header { lsrtags = "rhythms" @@ -41,22 +41,22 @@ changed to match the new @code{baseMoment}: % Set beam sub-group length to an eighth note \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 c32[ c c c c c c c] % Set beam sub-group length to a sixteenth note \set baseMoment = #(ly:make-moment 1/16) - \set beatStructure = #'(4 4 4 4) + \set beatStructure = 4,4,4,4 c32[ c c c c c c c] % Shorten beam by 1/32 \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 c32[ c c c c c c] r32 % Shorten beam by 3/32 \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 c32[ c c c c] r16. r2 } diff --git a/input/regression/autobeam-3-4-rules.ly b/input/regression/autobeam-3-4-rules.ly index 79aad6b6bb..04fabcb021 100644 --- a/input/regression/autobeam-3-4-rules.ly +++ b/input/regression/autobeam-3-4-rules.ly @@ -1,4 +1,4 @@ -\version "2.17.11" +\version "2.19.40" \header { @@ -28,7 +28,7 @@ is changed, beams should start at the beginning of the measure. c c c r r4 \bar "||" \set Timing.baseMoment = #(ly:make-moment 1/8) - \set Timing.beatStructure = #'(3 3) + \set Timing.beatStructure = 3,3 r8^\markup "Override to beam groups of 3 eighth notes" c c c c c r4. c8 c c c c c r4. } diff --git a/input/regression/beam-beat-grouping.ly b/input/regression/beam-beat-grouping.ly index 8af2e93ec7..8137ffd06a 100644 --- a/input/regression/beam-beat-grouping.ly +++ b/input/regression/beam-beat-grouping.ly @@ -7,13 +7,13 @@ signature. " \layout { ragged-right = ##t } -\version "2.19.21" +\version "2.19.40" \relative { \time 5/16 - \set beatStructure = #'(2 3) + \set beatStructure = 2,3 c''8[^"(2+3)" c16 c8] - \set beatStructure = #'(3 2) + \set beatStructure = 3,2 c8[^"(3+2)" c16 c8] } diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 649309ac6e..1a51c2b122 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -1,4 +1,4 @@ -\version "2.19.24" +\version "2.19.40" #(use-modules (srfi srfi-13) (ice-9 format)) @@ -172,7 +172,7 @@ stderr of this run." \test ##[ \clef "bass^(15)" #] \test ##[ \clef "alto_3" #] \test ##[ \time 2/4 #] -\test ##[ \time #'(3 2) 5/8 #] +\test ##[ \time 3,2 5/8 #] \test ##[ \bar "|." #] %% staff switches diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 270b5bc73d..5e27084142 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped. " } -\version "2.19.21" +\version "2.19.40" \layout { ragged-right = ##t @@ -22,11 +22,11 @@ brackets above beats when the beats of a time signature are grouped. " \relative { \time 2/4 c'8 a'4 a8~ - \time #'(3 2) 5/8 + \time 3,2 5/8 a8 bes4 r8 bes8-> \time 2/4 c,8 g'4 g8~ - \time #'(3 2) 5/8 + \time 3,2 5/8 g8 a4 g a4.-> } diff --git a/input/regression/multiple-time-sig-settings.ly b/input/regression/multiple-time-sig-settings.ly index 883124d4a6..91c53a3928 100644 --- a/input/regression/multiple-time-sig-settings.ly +++ b/input/regression/multiple-time-sig-settings.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.40" \header { texidoc = " @@ -13,12 +13,12 @@ by the markups. \overrideTimeSignatureSettings #'(4 . 4) % time signature fraction #'(1 . 4) % base moment fraction - #'(1 1 1 1) % beatStructure + 1,1,1,1 % beatStructure #'() % beamExceptions \overrideTimeSignatureSettings #'(3 . 4) % time signature fraction #'(1 . 4) % base moment fraction - #'(1 1 1) % beatStructure + 1,1,1 % beatStructure #'() % beamExceptions \time 4/4 c8^\markup {"Beam by 1/4"} c c c c c c c | diff --git a/input/regression/time-signature-settings-by-staff.ly b/input/regression/time-signature-settings-by-staff.ly index ad6dec591f..7daa85333c 100644 --- a/input/regression/time-signature-settings-by-staff.ly +++ b/input/regression/time-signature-settings-by-staff.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.40" \header { texidoc = " @@ -15,7 +15,7 @@ should be beamed 3/4, 1/4. The lower staff should be beamed 1/4, 3/4. \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(3 1) % beatStructure + 3,1 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} @@ -24,7 +24,7 @@ should be beamed 3/4, 1/4. The lower staff should be beamed 1/4, 3/4. \overrideTimeSignatureSettings 4/4 % timeSignatureFraction 1/4 % baseMomentFraction - #'(1 3) % beatStructure + 1,3 % beatStructure #'() % beamExceptions \time 4/4 \repeat unfold 8 {c''8} diff --git a/input/regression/tuplet-subdivision.ly b/input/regression/tuplet-subdivision.ly index 60df2449e2..158a6149a2 100644 --- a/input/regression/tuplet-subdivision.ly +++ b/input/regression/tuplet-subdivision.ly @@ -1,4 +1,4 @@ -\version "2.19.21" +\version "2.19.40" \header { @@ -10,7 +10,7 @@ Subdivision works properly for tuplets \relative { \set subdivideBeams = ##t \set baseMoment = #(ly:make-moment 1/8) - \set beatStructure = #'(2 2 2 2) + \set beatStructure = 2,2,2,2 \repeat unfold 8 { \tuplet 3/2 { c''16 e d } }