Regtest changes phase 1

3 files changed, 50 insertions, 21 deletions

diff --git a/input/regression/context-mod-with.ly b/input/regression/context-mod-with.ly
index 68ae7af707..6b1e5d7297 100644
--- a/input/regression/context-mod-with.ly
+++ b/input/regression/context-mod-with.ly
@@ -12,34 +12,61 @@ ctxmod = \with {
   \override StaffSymbol #'line-count = 4
 }
 
+\layout {
+  \context {
+    \Score
+    \remove "Mark_engraver"
+    \remove "Staff_collecting_engraver"
+  }
+  \context {
+    \Staff
+    \consists "Mark_engraver"
+    \consists "Staff_collecting_engraver"
+  }
+}
+
+
 music = \relative c'' { \key fis \minor c1 d e }
 
 \score { <<
+  \override Score.RehearsalMark #'self-alignment-X = #LEFT
+  \override Score.RehearsalMark #'font-size = #-2
   % No modifications:
-  \new Staff { \music }
-  % Some context modifications manually written in a \with block
+  \new Staff { \mark \markup { No modifications } \music }
   \new Staff \with {
     \remove "Time_signature_engraver"
     \consists "Ambitus_engraver"
     \override StaffSymbol #'line-count = 4
-  } { \music }
+  } {
+    \mark
+    \markup { "Remove time sig, add ambitus, set staff to 4 lines" }
+    \music }
+  % Some context modifications manually written in a \with block
+  \new Staff \with \ctxmod {
+    \mark \markup { "The same mods using a variable" } \music
+  }
   % The same mods as direct value of \with
-  \new Staff \with \ctxmod { \music }
-  % Mods as part of a \with block
-  \new Staff \with { \ctxmod } { \music }
+  \new Staff \with { \ctxmod } {
+    \mark \markup { "The same mods using a variable and \with" }
+    \music
+  }
   % Mods before a context mod in a with block are working:
   \new Staff \with {
     \remove "Clef_engraver"
     \ctxmod
-  } { \music }
+  } {
+    \mark
+    \markup { "Remove clef and use variable to add other changes as above" }
+    \music
+  }
   % Mods before and after a context mod in a with block are working:
   \new Staff \with {
     \remove "Clef_engraver"
     \ctxmod
     \remove "Key_engraver"
-  } { \music }
+  } { \mark \markup { "Also remove clef and key engravers" } \music }
   % Mods can be inserted instead of a \with block (i.e. \with is not required)
-  \new Staff \ctxmod { \music }
-  \new Staff { \music }
+  \new Staff \ctxmod { \mark \markup { "The same mods as staff 2" } \music }
+  \new Staff { \mark \markup { "Back to default" } \music }
 >>
 }
diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index 8c4afdf6ac..db8bd1b00a 100644
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,13 +1,9 @@
-
 \header {
   texidoc = "Users may define non-standard markup commands using
 the @code{define-markup-command} scheme macro."
 }
 
-
 \layout { ragged-right = ##t }
-  
-
 
 \version "2.14.0"
 
@@ -17,8 +13,7 @@ the @code{define-markup-command} scheme macro."
 
 \score{
   {
-    c''-\markup \upcase #"hello world"
-				% produces a "HELLO WORLD" markup
+    c''-\markup \upcase #"hello world in upper case"
   }
 
   \layout {
@@ -27,5 +22,4 @@ the @code{define-markup-command} scheme macro."
       \override PaperColumn #'keep-inside-line = ##f
     }
   }
-
 }
diff --git a/input/regression/relative-repeat.ly b/input/regression/relative-repeat.ly
index a8d3ac1ee7..2f482dd6a3 100644
--- a/input/regression/relative-repeat.ly
+++ b/input/regression/relative-repeat.ly
@@ -1,10 +1,18 @@
 \header {
-  texidoc = "Relative mode for repeats uses order of entry."
+  texidoc = "Using repeat unfold within a relative block gives a
+different result from writing the notes out in full.  The first
+system has all the notes within the stave.  In the second, the
+notes get progressively higher."
   }
 \version "2.14.0"
 
 \relative c' {
-  \repeat "unfold" 3
-  { f2 bes2 }
-  \alternative { a1 e b } 
+  c'1^"Using unfold"
+  \repeat unfold 3 { f,2^"Repeated" bes2 }
+  \alternative { { a2_"Alt1" c } { e_"Alt2" c } { b_"Alt3" d } }
+}
+
+\relative c' {
+  c'1^"The same notes, written out"
+  f,2 bes2 a2 c f2 bes2 e c f2 bes2 b d
 }