Doc-es: update Notation:Simultaneous and Staff.

[lilypond.git] / input / regression / time-signature-midmeasure.ly

diff --git a/input/regression/time-signature-midmeasure.ly b/input/regression/time-signature-midmeasure.ly
index 10b5891100ffa1206420b27fea28c80ad9ec5317..ed3d34f2adcaa80fe9157e814a18347699bfaa1e 100644 (file)
--- a/input/regression/time-signature-midmeasure.ly
+++ b/input/regression/time-signature-midmeasure.ly
@@ -1,28 +1,47 @@
-\version "2.19.4"
+\version "2.19.16"
 
 \header {
-  texidoc = "Time signature changes in midmeasure generate warnings,
-except in an anacrusis or when @code{ignoreBarChecks} is true.
-@code{measurePosition} is reset to 0, so a full measure follows, regardless
-of the original position.
+  texidoc = "Mid-measure time signature changes must be accompanied by
+\\partial.
 
-This example should end at bar 3, with no barline before the 2/4."
+In this example, no bar numbers should be omitted or repeated, and all
+double bar lines should have parenthesized bar numbers consistent with
+the single bar lines.  Both scores should look identical.
+
+@itemize @bullet
+@item \\time 2/4 occurs at a negative position
+@item \\time 6/8 occurs at a position less than the new measure length
+@item \\time 3/8 occurs at a position equal to the new measure length
+@item \\time 3/16 occurs at a position greater than the new measure length
+@end itemize"
 }
 
-#(ly:expect-warning (_ "\\time in mid-measure at 1/4"))
+\score {
+  \relative {
+    \set Score.barNumberVisibility = #all-bar-numbers-visible
+    \override Score.BarNumber.break-visibility = #all-visible
+    \time 2/4 \partial 8
+    a'8 | d4
+    \bar "||" \time 6/8 \partial 4.
+    cis8 b a | \barNumberCheck 2 g2. | \barNumberCheck 3 g4.
+    \bar "||" \time 3/8 \partial 4.
+    f4. | \barNumberCheck 4 f4. | \barNumberCheck 5 f4
+    \bar "||" \time 3/16 \partial 8
+    fis8 | \barNumberCheck 6 g16 a g | \barNumberCheck 7
+  }
+}
 
 \score {
   \relative {
+    \set Score.barNumberVisibility = #all-bar-numbers-visible
     \override Score.BarNumber.break-visibility = #all-visible
     \partial 8 \time 2/4
     a'8 | d4
-    \time 6/8 \partial 4.
-    cis8 b a | g4. \barNumberCheck 2
-    \set Timing.ignoreBarChecks = ##t
-    \time 12/8
-    fis4. e d
-    \time 2/4
-    \set Timing.ignoreBarChecks = ##f
-    a'2 | \barNumberCheck 3
+    \bar "||" \partial 4. \time 6/8
+    cis8 b a | \barNumberCheck 2 g2. | \barNumberCheck 3 g4.
+    \bar "||" \partial 4. \time 3/8
+    f4. | \barNumberCheck 4 f4. | \barNumberCheck 5 f4
+    \bar "||" \partial 8 \time 3/16
+    fis8 | \barNumberCheck 6 g16 a g | \barNumberCheck 7
   }
 }