(pattern): cleanup.

diff --git a/ChangeLog b/ChangeLog
index e847f78c3a493ad73156accdf7ed671dbacbcec6..6fa1225259b0b315e0f9e5b2539885cd510c426f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-01-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/regression/note-head-style.ly (pattern): cleanup.
+
        * mf/GNUmakefile ($(outdir)/$(redhat-package)): use http for
        downloading.
 

diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index 63705f9977cd5241a75b6978ca2854ae8c6e489d..f5eacc721124fd824327961932a25bcb48e3f6f4 100644 (file)
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -11,163 +11,68 @@ either up or down stems.
 "
 }
 
-\score {
-  \notes \transpose c c {
-    \clef C
-
-    \property Staff.NoteHead \set #'style = #'default
-    <<
+pattern = \notes <<
       \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
+        \property Voice.Stem \set #'direction = #UP
+        e'4
+         e'2. e'1 e'\breve*1/2 e'\longa*1/4
       }
       \new Voice {
-        \property Voice.Stem \set #'direction = #-1 %down
-        a16 a16 a8 a4 a2 a1 a\breve a\longa
+        \property Voice.Stem \set #'direction = #DOWN
+         a4 a2. a1 a\breve*1/2 a\longa*1/4
       }
     >>
-    \break
+
+\score {
+  \notes \transpose c c {
+    \clef C
+
+    \property Staff.NoteHead \set #'style = #'default
+    s1*0^\markup { "default" }
+    \pattern
 
     \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
+    s1*0^\markup { "baroque" }
+    \pattern
+        \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
+    s1*0^\markup { "neomensural" }
+    \pattern
 
     \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
-      }
-    >>
+    s1*0^\markup { "mensural" }
+    \pattern
+    
     \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
+    s1*0^\markup { "harmonic" }
+    \pattern
 
     \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
-      }
-    >>
+    s1*0^\markup { "diamond" }
+    \pattern
     \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
+    s1*0^\markup { "cross" }
+    \pattern
 
     \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
-      }
-    >>
+    s1*0^\markup { "xcircle" }
+\pattern
+    
     \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
+    s1*0^\markup { "triangle" }
+    \pattern
+    
 
     \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
+    s1*0^\markup { "slash" }
+    \pattern
     \break
 
     \new Voice <<
@@ -183,7 +88,6 @@ either up or down stems.
         \property Thread.NoteHead \set #'style = #'mensural d'16
       }
     >>
-
     \context Voice <<
       \new Thread {
         \property Thread.NoteHead \set #'style = #'cross

diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly
new file mode 100644 (file)
index 0000000..f5d9de3
--- /dev/null
+++ b/input/regression/tuplet-slope.ly
@@ -0,0 +1,31 @@
+\header {
+
+    texidoc = "Tuplet brackets stay clear of the staff. The
+slope is determined by the graphical characteristic of the notes, but
+if the musical pattern does not follow graphical slope, then the
+bracket is horizontal
+
+The bracket direction is determined by the dominating stem direction.
+ 
+"
+
+    }
+ 
+
+\version "2.1.12"
+
+\score {
+  \notes \relative c' {
+    \times 4/5 { a'4 as g fis f }
+    \times 4/5 { fis4 e es d des }
+    \times 4/5 { fis,4 e es d des }
+    \times 4/5 { bes'''4 bes,, b c cis }
+    \times 4/5 { a''4 b b c cis }
+  }
+
+  \paper {
+    linewidth = -1
+  }
+}
+
+% EOF