Issue 5283: Avoid different simultaneous marks in a regression test. (issue 341720043 by address@hidden)

[nine . fierce . ballads]

Reviewers: ,

Description:
https://sourceforge.net/p/testlilyissues/issues/5283/

The focus of context-mod-with.ly is on context modifications.
Its former unusual use of marks made it unnecessarily fragile.

Please review this at https://codereview.appspot.com/341720043/

Affected files (+8, -26 lines):
  M input/regression/context-mod-with.ly


Index: input/regression/context-mod-with.ly
diff --git a/input/regression/context-mod-with.ly  
b/input/regression/context-mod-with.ly
index  
391e49da48422228bc125cc22dfd46cd6ed17c18..fa5e426e84f82809fa96453e5aa70f9f332e8efa  
100644
--- a/input/regression/context-mod-with.ly
+++ b/input/regression/context-mod-with.ly
@@ -12,42 +12,25 @@ 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 { \key fis \minor c''1 d e }

 \score { <<
-  \override Score.RehearsalMark.self-alignment-X = #LEFT
-  \override Score.RehearsalMark.font-size = #-2
   % No modifications:
-  \new Staff { \mark \markup { No modifications } \music }
+  \new Staff { <>^\markup { No modifications } \music }
   \new Staff \with {
     \remove "Time_signature_engraver"
     \consists "Ambitus_engraver"
     \override StaffSymbol.line-count = 4
   } {
-    \mark
-    \markup { "Remove time sig, add ambitus, set staff to 4 lines" }
+    <>^\markup { "Remove time sig, add ambitus, set staff to 4 lines" }
     \music }
   % The same mods as direct value of \with
   \new Staff \with \ctxmod {
-    \mark \markup { "The same mods using a variable" } \music
+    <>^\markup { "The same mods using a variable" } \music
   }
   % Some context modifications manually written in a \with block
   \new Staff \with { \ctxmod } {
-    \mark \markup { "The same mods using a variable and \with" }
+    <>^\markup { "The same mods using a variable and \with" }
     \music
   }
   % Mods before a context mod in a with block are working:
@@ -55,8 +38,7 @@ music = \relative { \key fis \minor c''1 d e }
     \remove "Clef_engraver"
     \ctxmod
   } {
-    \mark
-    \markup { "Remove clef and use variable to add other changes as above"  
}
+    <>^\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:
@@ -64,9 +46,9 @@ music = \relative { \key fis \minor c''1 d e }
     \remove "Clef_engraver"
     \ctxmod
     \remove "Key_engraver"
-  } { \mark \markup { "Also remove clef and key engravers" } \music }
+  } { <>^\markup { "Also remove clef and key engravers" } \music }
   % Test rendered redundant by issue 4911
-  \new Staff \with \ctxmod { \mark \markup { "The same mods as staff 2" }  
\music }
-  \new Staff { \mark \markup { "Back to default" } \music }
+  \new Staff \with \ctxmod { <>^\markup { "The same mods as staff 2" }  
\music }
+  \new Staff { <>^\markup { "Back to default" } \music }
 >>
 }