2002-09-24 Juergen Reuter <reuter@ipd.uka.de>

[lilypond.git] / input / test / part-combine-moments.ly

diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly
index 8953992baccbc33cb35a311f65406ca94614de88..4ae00c0c0cf65cffb77c7c7a16b405f6493673ee 100644 (file)
--- a/input/test/part-combine-moments.ly
+++ b/input/test/part-combine-moments.ly
@@ -1,7 +1,9 @@
+\version "1.5.68"
+
 \score{
        \context PianoStaff <
-               \context StaffCombineStaff=one \skip 1*2;
-               \context StaffCombineStaff=two \skip 1*2;
+               \context StaffCombineStaff=one \skip 1*2
+               \context StaffCombineStaff=two \skip 1*2
                \context StaffCombineStaff=one \partcombine StaffCombineStaff
                        \context StaffCombineVoice=one \notes\relative c''
                                {
@@ -16,8 +18,8 @@
                >
        \paper {
 
-               textheight = 295.0\mm;
-               linewidth = 180.0\mm;
+               textheight = 295.0\mm
+               linewidth = 180.0\mm
 
                \translator{ \HaraKiriStaffContext }
                %
@@ -25,22 +27,22 @@
                %
                \translator{
                        \ThreadContext
-                       \name "VoiceCombineThread";
-                       \consists "Rest_engraver";
+                       \name "VoiceCombineThread"
+                       \consists "Rest_engraver"
                }
                \translator{
                        \VoiceContext
-                       \name "VoiceCombineVoice";
+                       \name "VoiceCombineVoice"
                        soloText = #"I."
                        soloIIText = #"II."
-                       \remove "Rest_engraver";
-                       \accepts "VoiceCombineThread";
+                       \remove "Rest_engraver"
+                       \accepts "VoiceCombineThread"
                }
                \translator{
                        \HaraKiriStaffContext
-                       \consists "Mark_engraver";
-                       \name "VoiceCombineStaff";
-                       \accepts "VoiceCombineVoice";
+                       \consists "Mark_engraver"
+                       \name "VoiceCombineStaff"
+                       \accepts "VoiceCombineVoice"
                }
 
                %
@@ -48,18 +50,18 @@
                %
                \translator{
                        \ThreadContext
-                       \name "StaffCombineThread";
+                       \name "StaffCombineThread"
                }
                \translator{
                        \VoiceContext
-                       \name "StaffCombineVoice";
-                       \accepts "StaffCombineThread";
-                       \consists "Thread_devnull_engraver";
+                       \name "StaffCombineVoice"
+                       \accepts "StaffCombineThread"
+                       \consists "Thread_devnull_engraver"
                }
                \translator {
                        \HaraKiriStaffContext
-                       \name "StaffCombineStaff";
-                       \accepts "StaffCombineVoice";
+                       \name "StaffCombineStaff"
+                       \accepts "StaffCombineVoice"
 
                        soloADue = ##t
                        soloText = #""
@@ -71,26 +73,24 @@
                }
                \translator {
                        \StaffGroupContext
-                       \accepts "VoiceCombineStaff";
-                       \accepts "StaffCombineStaff";
+                       \accepts "VoiceCombineStaff"
+                       \accepts "StaffCombineStaff"
                }
                \translator{ \HaraKiriStaffContext }
 
                \translator {
                        \ScoreContext
-                       \accepts "VoiceCombineStaff";
-                       \accepts "StaffCombineStaff";
+                       \accepts "VoiceCombineStaff"
+                       \accepts "StaffCombineStaff"
                        skipBars = ##t 
 
-                       barScriptPadding = #2.0 % dimension \pt
-                       markScriptPadding = #4.0
-
-                       %% urg: in pt?
-                       barNumberScriptPadding = #15
+                       %%FIXME barScriptPadding = #2.0 % dimension \pt
+                       RehearsalMark \override #'padding = #4
+                       BarNumber \override #'padding = #3
                        %% URG: this changes dynamics too
                        %%textStyle = #"italic"
-                       timeSignatureStyle = #"C"
-                       maximumRestCount = #1
+                       TimeSignature \override #'style = #'C
+                       RestCollision \set #'maximum-rest-count = #1
                }
        }
 }