X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcontext-mod-with.ly;fp=input%2Fregression%2Fcontext-mod-with.ly;h=3857cd1593c0d9614ec6063ee07cb93d8c06aef4;hb=0ac07f31e0f95fc18e5916ce756b9c746af7cc58;hp=abc8baec711ac3be3e46a8871d129428ca52e3a0;hpb=2f1263e2ccdddcac2eb9f7d8ce2ed92867d3d160;p=lilypond.git

diff --git a/input/regression/context-mod-with.ly b/input/regression/context-mod-with.ly
index abc8baec71..3857cd1593 100644
--- a/input/regression/context-mod-with.ly
+++ b/input/regression/context-mod-with.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.17.6"
 
 \header  {
 texidoc = "Context modifications can be stored into a variable as a
@@ -9,37 +9,64 @@ texidoc = "Context modifications can be stored into a variable as a
 ctxmod = \with {
   \remove "Time_signature_engraver"
   \consists "Ambitus_engraver"
-  \override StaffSymbol #'line-count = 4
+  \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 }
+    \override StaffSymbol.line-count = 4
+  } {
+    \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 }
 >>
 }