Merge commit 'origin' into beamlets2

[lilypond.git] / input / regression / note-head-style.ly

diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index d81b16661c18cebdf8468f11ff09d4ff640dfc84..98d33a27f57ed55baf522bfa96cbda15697a100d 100644 (file)
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,6 +1,6 @@
-\version "2.3.9"
+\version "2.12.0"
 \header{
-texidoc="
+  texidoc="
 Note head shapes may be set from several choices.  
 The stem endings should be adjusted according to the note head.  
 If you want different note head styles on one stem,
@@ -11,73 +11,90 @@ dimensions.
 "
 }
 
-pattern =  <<
-      \new Voice {
-        \override Stem  #'direction = #UP
-        e'4
-         e'2. e'1 e'\breve*1/2 e'\longa*1/4
-      }
-      \new Voice {
-        \override Stem  #'direction = #DOWN
-         a4 a2. a1 a\breve*1/2 a\longa*1/4
-      }
-    >>
-
-\score {
-   \transpose c c {
-    \clef C
-
-    \override Staff.NoteHead  #'style = #'default
-    s1*0^\markup { "default" }
-    \pattern
-
-    \override Staff.NoteHead  #'style = #'baroque
-    s1*0^\markup { "baroque" }
-    \pattern
-        \break
-
-    \override Staff.NoteHead  #'style = #'neomensural
-    s1*0^\markup { "neomensural" }
-    \pattern
-
-    \override Staff.NoteHead  #'style = #'mensural
-    s1*0^\markup { "mensural" }
-    \pattern
-    
-    \break
-
-    \override Staff.NoteHead  #'style = #'harmonic
-    s1*0^\markup { "harmonic" }
-    \pattern
-
-    \override Staff.NoteHead  #'style = #'diamond
-    s1*0^\markup { "diamond" }
-    \pattern
-    \break
-
-    \override Staff.NoteHead  #'style = #'cross
-    s1*0^\markup { "cross" }
-    \pattern
-
-    \override Staff.NoteHead  #'style = #'xcircle
-    s1*0^\markup { "xcircle" }
-\pattern
-    
-    \break
-
-    \override Staff.NoteHead  #'style = #'triangle
-    s1*0^\markup { "triangle" }
-    \pattern
-    
-
-    \override Staff.NoteHead  #'style = #'slash
-    s1*0^\markup { "slash" }
-    \pattern
-    \break
-  }
+\layout {
+  indent = 0.0
+  ragged-right = ##t
+}
 
-  \paper {
-    indent = 0.0
-    raggedright = ##t
+pattern = <<
+  \new Voice {
+    \override Stem  #'direction = #UP
+    e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4
   }
+  \new Voice {
+    \override Stem  #'direction = #DOWN
+    a4 a2. a1 a\breve*1/2 a\longa*1/4
+  }
+>>
+
+
+\transpose c c {
+  \clef C
+
+  \override Staff.NoteHead  #'style = #'default
+  s1*0^\markup { "default" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'baroque
+  s1*0^\markup { "baroque" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'neomensural
+  s1*0^\markup { "neomensural" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'mensural
+  s1*0^\markup { "mensural" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'petrucci
+  s1*0^\markup { "petrucci" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'harmonic
+  s1*0^\markup { "harmonic" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'harmonic-black
+  s1*0^\markup { "harmonic-black" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'harmonic-mixed
+  s1*0^\markup { "harmonic-mixed" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'diamond
+  s1*0^\markup { "diamond" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'cross
+  s1*0^\markup { "cross" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'xcircle
+  s1*0^\markup { "xcircle" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'triangle
+  s1*0^\markup { "triangle" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'slash
+  s1*0^\markup { "slash" }
+  \pattern
 }
+
+
+