resolve merge

[lilypond.git] / input / regression / page-spacing-rehearsal-mark.ly

diff --git a/input/regression/page-spacing-rehearsal-mark.ly b/input/regression/page-spacing-rehearsal-mark.ly
new file mode 100644 (file)
index 0000000..7a2a574
--- /dev/null
+++ b/input/regression/page-spacing-rehearsal-mark.ly
@@ -0,0 +1,22 @@
+\version "2.14.0"
+
+\header {
+  texidoc = "The space taken up by rehearsal marks is correctly
+accounted for, even though they live in the Score context."
+}
+
+#(set-default-paper-size "a6")
+
+\book {
+  \paper {
+    oddHeaderMarkup = "header"
+    ragged-last-bottom = ##f
+  }
+  \score {
+    <<
+      \new Staff { \mark \markup \column { T A L L M A R K } c'1 \break
+                  \mark \markup \column { T A L L M A R K } c'1 }
+      \new Staff { c'1 \break c'1 }
+    >>
+  }
+}