patch::: 1.3.121.jcn2

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

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 5f2ebd04e284c9c68aa9885e4da075d3c40a55cd..cdf375b43e9b0e5bcb9eabf22c53753ac3070321 100644 (file)
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,69 +1,69 @@
-\version "1.0.20";
+\version "1.3.117";
 
-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 }
+toeterI =  \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  { 
 
-       c'''4 c c c \break
+       c'''4^"toet I" c c c 
        d d d d \break
-       R1 \break 
+       R1 
        \context Voice = upper {
                e4 e e e \break }
-       f f f f \break
+       f f f f
        g g g g 
 }>
 
-toeter_ii = \notes \relative c \context Voice = together { 
-       c''4 c c c \break
-       d d d d \break
-       R1 \break
+toeterIi =  \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 \break
+               \stemDown 
+               e4 e e e 
         }
-       f f f f \break
+       f f f f 
        g g g g
 }
 
-toeters = \context Staff = toeters <
+toeters =  \context Staff = toeters <
        \toeter_i
        \toeter_ii
 >
  
-zager = \context Staff = zager \notes \relative c'' {
+zager =  \context Staff = zager \notes \relative c'' {
        \clef treble;
-       \property Staff.instrument = "Zager"
-       \property Staff.instr = "Zag."
-       c4 d e f \break
-       \property Staff.instr = "Zag. \& Zog."
-       f e d c \break
-       c d e f \break
-       \property Staff.instr = "Zag."
-       \stemup
-       f e d c \break
-       c d e f \break
+       \property Staff.instrument = #"Zager"
+       \property Staff.instr = #"Zag."
+       c4^"zag" d e f 
+       \property Staff.instr = #"Zag. \\& Zog."
+       f e d c 
+       c d e f 
+       \property Staff.instr = #"Zag."
+       \stemUp
+       f e d c 
+       c d e f 
        f e d c
 }
 
-zoger = \context Staff = zoger \notes \relative c'' {
+zoger =  \context Staff = zoger \notes \relative c'' {
        \clef treble;
-       \property Staff.instrument = "Zoger"
-       \property Staff.instr = "Zog."
-       c4 d e f \break
+       \property Staff.instrument = #"Zoger"
+       \property Staff.instr = #"Zog."
+       c4^"zog" d e f 
        \skip 1*2;
 
        \translator Staff=zager
-       \stemdown 
+       \stemDown 
        c2 g2
        
-       a4 b c d \break
+       a4 b c d 
        \skip 1*1;
 }
 
-zagers = \context GrandStaff <
+zagers =  \context GrandStaff <
        \zager
        \zoger
 >
@@ -78,7 +78,7 @@ zagers = \context GrandStaff <
                >
        >
        \paper{
-               linewidth = 40.0\mm;
+               linewidth = 80.0\mm;
                \translator { \HaraKiriStaffContext }
 %uh?
                \translator { \OrchestralScoreContext }