Imported Upstream version 2.18.0

[lilypond.git] / input / regression / metronome-marking-break-align.ly

diff --git a/input/regression/metronome-marking-break-align.ly b/input/regression/metronome-marking-break-align.ly
index 849ebb6146ea6a388ffa09d3553725f4853ce0ba..90e99212b8c0c4f187b00505d701993f62114b4d 100644 (file)
--- a/input/regression/metronome-marking-break-align.ly
+++ b/input/regression/metronome-marking-break-align.ly
@@ -1,14 +1,15 @@
-\version "2.16.0"
+\version "2.17.6"
 
 \header {
   texidoc = "@code{\\tempo} marks are aligned with the time signature
-or first musical element unless the first element is a multi-measure
-rest: in this case, the tempo mark is aligned with the bar line.
+or the position of the first note.
 
 By overriding @code{break-align-symbols} the default alignment can be
-changed, as shown by the final metronome mark in this snippet, aligned
-with a key signature.
-"  
+changed.  If no symbol in @code{break-align-symbols} is present, the
+property @code{non-break-align-symbols} determines the alignment.  If
+the alignment object is a multi-measure rest, the tempo mark is aligned
+with the preceding bar line.
+"
 }
 
 \layout {
@@ -23,13 +24,19 @@ with a key signature.
   c1 \break
   \tempo "T-break"
   c1
-  \tempo "T-rest"
+  \tempo "T-phantom"
   R1 \break
   \time 8/8
   \tempo "T-time"
   R1
-  \override Score.MetronomeMark #'break-align-symbols = #'(key-signature)
+  \override Score.MetronomeMark.break-align-symbols = #'(key-signature)
   \key as \major
   \tempo "T-key"
+  c1 \break
+  \override Score.MetronomeMark.non-break-align-symbols =
+    #'(note-column-interface multi-measure-rest-interface)
+  \tempo "T-rest"
+  R1
+  \tempo "T-rest"
   R1
 }