release: 1.1.67

[lilypond.git] / input / test / hara-kiri.ly

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index f4f6807837b1494e9bc79f2507bc1f1603faf0a5..8c293bd0336a78e794e187f370897f512b6d146c 100644 (file)
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,38 +1,40 @@
-\version "1.0.4";
+\version "1.1.66";
+
+toeter_i = \notes\relative c <{
+               \property Staff.instrument = "Toeters"
+               \property Staff.instr = "Ttr." }
+       \context Voice = lower { \stemdown s1*6 }
+       \context Voice = upper { \stemup s1*6 }
+       \context Voice = together  { 
 
-toeter_i = \notes\relative c {
-       \property Staff.instrument = "Toeters"
-       \property Staff.instr = "Ttr."
        c'''4 c c c \break
        d d d d \break
-       R1 \break
-       \voiceone
-       e4 e e e \break
-       \onevoice
+       R1 \break 
+       \context Voice = upper {
+               e4 e e e \break }
        f f f f \break
-       g g g g
-}
+       g g g g 
+}>
 
-toeter_ii = \notes \relative c {
+toeter_ii = \notes \relative c \context Voice = together { 
        c''4 c c c \break
        d d d d \break
        R1 \break
-       \voicetwo
-       e4 e e e \break
-       \onevoice
+       \context Voice = lower {
+               \stemdown 
+               e4 e e e \break
+        }
        f f f f \break
        g g g g
 }
 
-toeters = \type StaffGroup = xtoeters <
-       \type Staff = toeters <
+toeters = \context Staff = toeters <
        \toeter_i
        \toeter_ii
-       >
 >
  
-zager = \type Staff = zager \notes \relative c {
-       \clef bass;
+zager = \context Staff = zager \notes \relative c'' {
+       \clef treble;
        \property Staff.instrument = "Zager"
        \property Staff.instr = "Zag."
        c4 d e f \break
@@ -40,46 +42,47 @@ zager = \type Staff = zager \notes \relative c {
        f e d c \break
        c d e f \break
        \property Staff.instr = "Zag."
-       \voiceone
+       \stemup
        f e d c \break
-       \onevoice
        c d e f \break
        f e d c
 }
 
-zoger = \type Staff = zoger \notes \relative c {
-       \clef bass;
+zoger = \context Staff = zoger \notes \relative c'' {
+       \clef treble;
        \property Staff.instrument = "Zoger"
        \property Staff.instr = "Zog."
        c4 d e f \break
        \skip 1*2;
-%      \staffone
+
        \translator Staff=zager
-       \voicetwo
-       c2 g2\break
-       \onevoice
+       \stemdown 
+       c2 g2
+       
        a4 b c d \break
        \skip 1*1;
 }
 
- \include "score-paper.ly";
-
-zagers = \type GrandStaff <
+zagers = \context GrandStaff <
        \zager
        \zoger
 >
  
 \score{
        <
-               \type StaffGroup = toeters <
+               \context StaffGroup = toeters <
                        \toeters
                >
-               \type StaffGroup = zagers <
+               \context StaffGroup = zagers <
                        \zagers
                >
        >
        \paper{
                linewidth = 40.0\mm;
+               \translator { \HaraKiriStaffContext }
+%uh?
+               \translator { \OrchestralScoreContext }
+%              \translator { \OrchestralPartStaffContext }
        }
 }