Merge commit 'origin' into includes

[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 32f660bd0882b6cb6a9a64cedab23d22449587a4..98d33a27f57ed55baf522bfa96cbda15697a100d 100644 (file)
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,63 +1,100 @@
+\version "2.12.0"
 \header{
-texidoc="
-Note head shapes are settable.  The stem endings should be adjusted
-per note head.  If you want different note head styles on one stem,
-you must create a special context called Thread.
+  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,
+you must create a special context.
 
 Harmonic notes have a different shape and different
-dimensions. Nevertheless, noteheads in both styles can be combined, on
-either up or down stems.
-";
+dimensions. 
+"
 }
 
+\layout {
+  indent = 0.0
+  ragged-right = ##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
+  }
+>>
 
 
-\score { \notes \relative c{
+\transpose c c {
+  \clef C
 
-c''4 c2 c8  c16 c16 c1 c\breve
-\property Voice.NoteHead \set #'style = #'diamond
-c4 c2 c8  c16 c16  c1 c\breve
-\property Voice.NoteHead \set #'style = #'transparent
-c4 c2 c8  c16 c16  c1 c\breve
-\property Voice.NoteHead \set #'style = #'cross
-c4 c2 c8  c16 c16  c1 c\breve
-\property Voice.NoteHead \set #'style = #'mensural
-c4 c2 c8  c16 c16  c1 c\breve c\longa
-\property Voice.NoteHead \set #'style = #'harmonic
-c4 c2 c8  c16 c16  c1 c\breve
-\property Voice.NoteHead \set #'style = #'baroque
-c4 c2 c8  c16 c16  c1 c\breve c\longa
+  \override Staff.NoteHead  #'style = #'default
+  s1*0^\markup { "default" }
+  \pattern
 
+  \override Staff.NoteHead  #'style = #'baroque
+  s1*0^\markup { "baroque" }
+  \pattern
 
-   \context Voice <
-    \context Thread = TA
-      {
-        \property Thread.NoteHead \set #'style = #'cross
-        \property Voice.Stem \set #'direction = #1
-        c16
-       }
-    \context Thread = TB
-      { \property Thread.NoteHead \set #'style = #'default a16  }
+  \break
 
-    \context Thread = TC
-      { \property Thread.NoteHead \set #'style = #'mensural d16 }
+  \override Staff.NoteHead  #'style = #'neomensural
+  s1*0^\markup { "neomensural" }
+  \pattern
 
-  >
+  \override Staff.NoteHead  #'style = #'mensural
+  s1*0^\markup { "mensural" }
+  \pattern
 
+  \break
 
-   \context Voice <\context Thread = TA {
-   \property Thread.NoteHead \set #'style = #'default
-   c4 c4 }
-\context Thread = TB {
-   \property Thread.NoteHead \set #'style = #'mensural
-  c'4 \stemDown c
-} >
+  \override Staff.NoteHead  #'style = #'petrucci
+  s1*0^\markup { "petrucci" }
+  \pattern
 
-}
+  \override Staff.NoteHead  #'style = #'harmonic
+  s1*0^\markup { "harmonic" }
+  \pattern
 
-    \paper {
+  \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
 }
-}
+
+
+