Merge branch 'stable'

[lilypond.git] / input / new / changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly

diff --git a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
index 6cef1f87702d12b13930cb60b42f9421d74e3b30..f7007eb1ce761d6f1767849dba26ec7d58c3d5fc 100644 (file)
--- a/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
+++ b/input/new/changing-time-signatures-inside-a-polymetric-section-using-scaledurations.ly
@@ -1,13 +1,13 @@
-\version "2.11.48"
+\version "2.12.0"
 \header {
   lsrtags = "rhythms,contexts-and-engravers"
   texidoc = "The @code{measureLength} property, together with
-@code{measurePosition}, determines when a bar line is needed. However,
+@code{measurePosition}, determines when a bar line is needed.  However,
 when using @code{\\scaleDurations}, the scaling of durations makes it
-difficult to change time signatures without making a mess of it.
-Therefore, @code{measureLength} has to be set manually, using the
-@code{ly:make-moment} callback. The second argument must be the same as
-the second argument of @code{\\scaleDurations}."
+difficult to change time signatures.  In this case, @code{measureLength}
+should be set manually, using the @code{ly:make-moment} callback.  The
+second argument must be the same as the second argument of
+@code{\\scaleDurations}."
   doctitle = "Changing time signatures inside a polymetric section using @code{\\scaleDurations}"
 }
 
@@ -28,10 +28,10 @@ the second argument of @code{\\scaleDurations}."
   \new Staff {
     \scaleDurations #'(8 . 5) {
       \time 6/8
-      \set Timing.measureLength = #(ly:make-moment 3 5)
+      \set Timing.measureLength = #(ly:make-moment 6 5)
       b8 b b b b b
       \time 2/4
-      \set Timing.measureLength = #(ly:make-moment 2 5)
+      \set Timing.measureLength = #(ly:make-moment 4 5)
       b4 b
     }
   }