release: 1.1.37

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

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 79131779561b1a70118dff12095903cbc1102a5e..3acad5cad57c7bbd297e5a205b8a7711e4c2fe31 100644 (file)
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,5 +1,6 @@
+\version "1.0.14";
 
-toeter_i = \melodic\relative c {
+toeter_i = \notes\relative c {
        \property Staff.instrument = "Toeters"
        \property Staff.instr = "Ttr."
        c'''4 c c c \break
@@ -12,7 +13,7 @@ toeter_i = \melodic\relative c {
        g g g g
 }
 
-toeter_ii = \melodic \relative c {
+toeter_ii = \notes \relative c {
        c''4 c c c \break
        d d d d \break
        R1 \break
@@ -23,14 +24,12 @@ toeter_ii = \melodic \relative c {
        g g g g
 }
 
-toeters = \type StaffGroup = xtoeters <
-       \type Staff = toeters <
+toeters = \type Staff = toeters <
        \toeter_i
        \toeter_ii
-       >
 >
  
-zager = \type Staff = zager \melodic \relative c {
+zager = \type Staff = zager \notes \relative c {
        \clef bass;
        \property Staff.instrument = "Zager"
        \property Staff.instr = "Zag."
@@ -46,7 +45,7 @@ zager = \type Staff = zager \melodic \relative c {
        f e d c
 }
 
-zoger = \type Staff = zoger \melodic \relative c {
+zoger = \type Staff = zoger \notes \relative c {
        \clef bass;
        \property Staff.instrument = "Zoger"
        \property Staff.instr = "Zog."
@@ -61,8 +60,6 @@ zoger = \type Staff = zoger \melodic \relative c {
        \skip 1*1;
 }
 
-default_paper = \include "score-paper.ly";
-
 zagers = \type GrandStaff <
        \zager
        \zoger
@@ -79,6 +76,10 @@ zagers = \type GrandStaff <
        >
        \paper{
                linewidth = 40.0\mm;
+               \translator { \HaraKiriStaffContext }
+%uh?
+%              \translator { \OrchestralScoreContext }
+%              \translator { \OrchestralPartStaffContext }
        }
 }