Merge commit 'origin' into beamlets2

[lilypond.git] / input / regression / markup-note.ly

diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 64b0afa3e655418befab168e5ddb7f5d8e1bdb30..0cdc526b35e32890e049aba451e61ef20011082c 100644 (file)
--- a/input/regression/markup-note.ly
+++ b/input/regression/markup-note.ly
@@ -1,11 +1,13 @@
 \header {
 
-    texidoc = "The note markup function may be used to make metronome
+  texidoc = "The note markup function may be used to make metronome
  markings. It works for a variety of flag, dot and duration settings."
 }
-\version "2.1.30"
+\version "2.12.0"
 
-\score { \notes { c4^\markup {
+\relative c''
+{
+  c4^\markup {
     \note #"1" #1
     \note #"2" #1
     \note #"4" #1
@@ -38,6 +40,17 @@
     \note #"32." #1
     \note #"64." #1
 
-}
+    \override #'(style . cross)
+    { \note-by-number #2 #1 #1
+      \note-by-number #2 #1 #-1
+    } 
+    \override #'(style . triangle)
+    { \note-by-number #2 #1 #1
+      \note-by-number #2 #1 #-1
+    }
+
+  }
 
-} }
+  \override NoteHead #'style = #'triangle
+  c4 a
+}