Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 14c6b5925903302f9d5628d0a0c5ba2d5e6758b1..5ea9ceb6a7413c3bd4f4d553af04493801cc0aaa 100644 (file)
--- a/input/regression/markup-note.ly
+++ b/input/regression/markup-note.ly
@@ -1,43 +1,56 @@
 \header {
 
-    texidoc = "The note markup function is used to make metronome
- markings. It works for a variety of flag dot and duration settings."
+  texidoc = "The note markup function may be used to make metronome
+ markings. It works for a variety of flag, dot and duration settings."
 }
-\version "1.9.8"
-
-\score { \notes { c4^\markup {
-    \note #0 #0 #1
-    \note #1 #0 #1
-    \note #2 #0 #1
-    \note #3 #0 #1
-    \note #4 #0 #1
-    \note #5 #0 #1
-    \note #6 #0 #1
-
-    \note #0 #0 #-1
-    \note #1 #0 #-1
-    \note #2 #0 #-1
-    \note #3 #0 #-1
-    \note #4 #0 #-1
-    \note #5 #0 #-1
-    \note #6 #0 #-1
-
-    \note #0 #1 #-1
-    \note #1 #1 #-1
-    \note #2 #1 #-1
-    \note #3 #1 #-1
-    \note #4 #1 #-1
-    \note #5 #1 #-1
-    \note #6 #1 #-1
-
-    \note #0 #1 #1
-    \note #1 #1 #1
-    \note #2 #1 #1
-    \note #3 #1 #1
-    \note #4 #1 #1
-    \note #5 #1 #1
-    \note #6 #1 #1
+\version "2.11.51"
 
-}
+\relative c''
+{
+  c4^\markup {
+    \note #"1" #1
+    \note #"2" #1
+    \note #"4" #1
+    \note #"8" #1
+    \note #"16" #1
+    \note #"32" #1
+    \note #"64" #1
+
+    \note #"1" #-1
+    \note #"2" #-1
+    \note #"4" #-1
+    \note #"8" #-1
+    \note #"16" #-1
+    \note #"32" #-1
+    \note #"64" #-1
+
+    \note #"1." #-1
+    \note #"2." #-1
+    \note #"4." #-1
+    \note #"8." #-1
+    \note #"16." #-1
+    \note #"32." #-1
+    \note #"64." #-1
+
+    \note #"1." #1
+    \note #"2." #1
+    \note #"4." #1
+    \note #"8." #1
+    \note #"16." #1
+    \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
+}