X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fnote-head-style.ly;h=5fe18054d40188562947336d01052fcaded6a9a5;hb=46e296f5381495ce30108aa981e549d61e55a009;hp=63705f9977cd5241a75b6978ca2854ae8c6e489d;hpb=4c8187e65dd9708d7733692842acc696da121bf1;p=lilypond.git

diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 63705f9977..5fe18054d4 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,205 +1,111 @@
-\version "2.1.7"
+\version "2.15.12"
 \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.
 "
 }
 
-\score {
-  \notes \transpose c c {
-    \clef C
-
-    \property Staff.NoteHead \set #'style = #'default
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'default" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'baroque
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'baroque" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'neo_mensural
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'neo\_mensural" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'mensural
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'mensural" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'harmonic
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'harmonic" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'diamond
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'diamond" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'cross
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'cross" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'xcircle
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'xcircle" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'triangle
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'triangle" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \set #'style = #'slash
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'style = \#'slash" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \break
-
-    \property Staff.NoteHead \override #'transparent = ##t
-    <<
-      \new Voice {
-        \property Voice.Stem \set #'direction = #1 %up
-        e'16^\markup { "NoteHead \#'transparent = \#\#t" }
-        e'16 e'8 e'4 e'2 e'1 e'\breve e'\longa
-      }
-      \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
-      }
-    >>
-    \property Staff.NoteHead \revert #'transparent
-    \break
-
-    \new Voice <<
-      \new Thread {
-        \property Thread.NoteHead \set #'style = #'cross
-        \property Voice.Stem \set #'direction = #1
-        c'16
-      }
-      \new Thread {
-        \property Thread.NoteHead \set #'style = #'default a16
-      }
-      \new Thread {
-        \property Thread.NoteHead \set #'style = #'mensural d'16
-      }
-    >>
-
-    \context Voice <<
-      \new Thread {
-        \property Thread.NoteHead \set #'style = #'cross
-        c'4 c'4 c'4 c'4
-      }
-      \new Thread {
-        \property Thread.NoteHead \set #'style = #'mensural
-        c''4 \stemDown c''
-        \property Thread.NoteHead \set #'style = #'slash
-        \stemUp c''4 \stemDown c''
-      }
-    >>
-  }
+\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
+    g4 g2. g1 g\breve*1/2 g\longa*1/4
+  }
+>>
+
+
+\transpose c c {
+  \clef C
+
+  \override Staff.NoteHead  #'style = #'default
+  s1*0^\markup { "default" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'altdefault
+  s1*0^\markup { "altdefault" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'baroque
+  s1*0^\markup { "baroque" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'neomensural
+  s1*0^\markup { "neomensural" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'mensural
+  s1*0^\markup { "mensural" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'petrucci
+  s1*0^\markup { "petrucci" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'harmonic
+  s1*0^\markup { "harmonic" }
+  \pattern
+
+  \override Staff.NoteHead  #'style = #'harmonic-black
+  s1*0^\markup { "harmonic-black" }
+  \pattern
+
+  \break
+
+  \override Staff.NoteHead  #'style = #'harmonic-mixed
+  s1*0^\markup { "harmonic-mixed" }
+  \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
+
+  \override Staff.NoteHead  #'style = #'kievan
+  s1*0^\markup { "kievan" }
+  \pattern
+
 }
+
+
+