Merge branch 'stable'

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

diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly
index b48fddb6e5917c0f66446d945a77c5cb8dab924b..3aab1f6af32f6fec2e80e6042e332eb331abf85d 100644 (file)
--- a/input/regression/rehearsal-mark-number.ly
+++ b/input/regression/rehearsal-mark-number.ly
@@ -1,33 +1,26 @@
 \header { texidoc= "
 
 Marks can be printed as numbers.  
-By setting @code{markFormatter} we may choose a different style of mark printing. Also, marks can be specified manually, with a markup argument" 
+By setting @code{markFormatter} we may choose a different style of mark printing. Also, marks can be specified manually, with a markup argument." 
          
       }
 
-\version "2.1.7"
-
-
-global =  \notes {
-    \property Score.markFormatter = #format-mark-numbers 
-  s1 | \mark \markup { \musicglyph #"scripts-coda" }
-  s1 | \mark \default
-  s1 | \mark \default
-    \property Score.markFormatter
-    = #(lambda (mark  context)
-       (make-bold-markup (make-box-markup (number->string mark))))
-       
-    s1 | \mark \default
-    s1 | \mark \default
-  }
-
-
-one =  \notes \relative c {
-  c''1 c c c c c c 
-}
-
-
-\score{
-\context Staff << \global \one >>
+\version "2.12.0"
+
+\paper { ragged-right = ##t } 
+
+\relative c''{
+  \set Score.markFormatter = #format-mark-numbers 
+  c1 | \mark \markup { \musicglyph #"scripts.coda" }
+  c1 | \mark \default
+  c1 | \mark \default
+  \set Score.markFormatter
+  = #(lambda (mark  context)
+      (make-box-markup (format-mark-numbers mark context)))
+  c1 | \mark \default
+  \set Score.markFormatter
+  = #(lambda (mark  context)
+      (make-circle-markup (format-mark-numbers mark context)))
+  c1 | \mark \default
 }