X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=Documentation%2Fnotation%2Frhythms.itely;h=27241d8fde0a836ec07292f6c747e5c5980d350a;hb=3ecc98aa5db8a47adcf9defc4ec9fc018c5cc47d;hp=9f0adb7741f002a7b8371061f08366fc66889d58;hpb=bb3285ff1f4cd437ba52afbaa53e7ff5946a7140;p=lilypond.git 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 }