release: 1.3.7

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

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 89b6cb0682e32a41ec3365d3ba57fb6b3ed4dbbd..dc0bcd1f983a6a3590666a30ec376c8dd0e754c9 100644 (file)
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,90 +1,88 @@
-\version "1.0.7";
+\version "1.3.5";
 
-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
-       f f f f \break
-       g g g g
-}
+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_ii = \notes \relative c {
-       c''4 c c c \break
+       c'''4^"toet I" c c c 
        d d d d \break
-       R1 \break
-       \voicetwo
-       e4 e e e \break
-       \onevoice
-       f f f f \break
+       R1 
+       \context Voice = upper {
+               e4 e e e \break }
+       f f f f
+       g g g g 
+}>
+
+toeter_ii = \notes \relative c \context Voice = together { 
+       c''4^"toet II" c c c 
+       d d d d 
+       R1 
+       \context Voice = lower {
+               \stemdown 
+               e4 e e e 
+        }
+       f f f f 
        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
+       c4^"zag" d e f 
        \property Staff.instr = "Zag. \& Zog."
-       f e d c \break
-       c d e f \break
+       f e d c 
+       c d e f 
        \property Staff.instr = "Zag."
-       \voiceone
-       f e d c \break
-       \onevoice
-       c d e f \break
+       \stemup
+       f e d c 
+       c d e f 
        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
+       c4^"zog" d e f 
        \skip 1*2;
-%      \staffone
+
        \translator Staff=zager
-       \voicetwo
-       c2 g2\break
-       \onevoice
-       a4 b c d \break
+       \stemdown 
+       c2 g2
+       
+       a4 b c d 
        \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 = 80.0\mm;
                \translator { \HaraKiriStaffContext }
 %uh?
-%              \translator { \OrchestralScoreContext }
+               \translator { \OrchestralScoreContext }
 %              \translator { \OrchestralPartStaffContext }
-               }
-               linewidth = 40.0\mm;
        }
 }