X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fnote-head-style.ly;h=c0833981e46053e04357afe8e42e34421a7a14ff;hb=8508ea37a36b61030fd17b4ec86259f235872f39;hp=cd6d7f05f60b8d9bd0a0990bfbd79d4a4f5755f2;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index cd6d7f05f6..c0833981e4 100644
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,68 +1,84 @@
-\version "1.3.146"
+\version "2.19.22"
 \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 \relative c'{ \clef C
-% \property Voice.Stem \override #'thickness = #5.0
-\property Voice.NoteHead \set #'style = #'default
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'diamond
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'transparent
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'cross
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'xcircle
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'triangle
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'slash
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'mensural
-c4 c2 c8  c16 c16  c1 c\breve c\longa b4 b2 b8  b16 b16 b1 b\breve b\longa \break
-\property Voice.NoteHead \set #'style = #'harmonic
-c4 c2 c8  c16 c16 c1 c\breve b4 b2 b8  b16 b16 b1 b\breve \break
-\property Voice.NoteHead \set #'style = #'baroque
-c4 c2 c8  c16 c16  c1 c\breve c\longa b4 b2 b8  b16 b16 b1 b\breve b\longa \break
-
-
-   \context Voice = another <
-    \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  }
-
-    \context Thread = TC
-      { \property Thread.NoteHead \set #'style = #'mensural d16 }
-
-  >
-
-
-   \context Voice <
-     \context Thread = TA {
-       \property Thread.NoteHead \set #'style = #'cross
-       c4 c4 c4 c4 }
-     \context Thread = TB {
-       \property Thread.NoteHead \set #'style = #'mensural
-       c'4 \stemDown c
-       \property Thread.NoteHead \set #'style = #'slash
-       \stemUp c4 \stemDown c
-} >
-
+\layout {
+  indent = 0.0
+  ragged-right = ##t
 }
 
-    \paper {}
+pattern =
+#(define-music-function (name style) (markup? ly:context-mod?)
+#{ <<
+  s1^#name
+  \new Voice \with #style {
+    \override Stem.direction = #UP
+    e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4
+  }
+  \new Voice \with #style {
+    \override Stem.direction = #DOWN
+    g4 g2. g1 g\breve*1/2 g\longa*1/4
+  }
+>> #})
+
+patternStyle =
+#(define-music-function (style) (symbol?)
+  #{
+     \pattern #(symbol->string style) \with {
+       \override NoteHead.style = #style
+     }
+  #})
+
+\transpose c c {
+  \clef C
+
+  \patternStyle default
+  \patternStyle altdefault
+
+  \break
+
+  \patternStyle baroque
+  \patternStyle neomensural
+
+  \break
+
+  \patternStyle mensural
+  \patternStyle petrucci
+
+  \break
+
+  \patternStyle harmonic
+  \patternStyle harmonic-black
+
+  \break
+
+  \patternStyle harmonic-mixed
+  \patternStyle diamond
+
+  \break
+
+  \patternStyle cross
+  \patternStyle xcircle
+
+  \break
+
+  \patternStyle triangle
+  \patternStyle slash
+
+  \break
+
+  \pattern "kievan" \with { \kievanOn }
+
 }
+
+
+