release: 1.3.146

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

diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly
index 7590a333e0a46b6be4c3a70a4d03c883ce23be72..168d5f0d042b51147257c3558115c201cf14410a 100644 (file)
--- a/input/test/part-combine-staff.ly
+++ b/input/test/part-combine-staff.ly
@@ -1,7 +1,9 @@
+\version "1.3.146"
+
 \score{
        \context PianoStaff <
-               \context StaffCombineStaff=one \skip 1*7;
-               \context StaffCombineStaff=two \skip 1*7;
+               \context StaffCombineStaff=one \skip 1*7
+               \context StaffCombineStaff=two \skip 1*7
                \context StaffCombineStaff=one \partcombine StaffCombineStaff
                        \context StaffCombineVoice=one \notes\relative c''
                                {
@@ -26,8 +28,8 @@
                >
        \paper {
 
-               textheight = 295.0\mm;
-               linewidth = 180.0\mm;
+               textheight = 295.0\mm
+               linewidth = 180.0\mm
 
                \translator{ \HaraKiriStaffContext }
                %
@@ -35,22 +37,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"
                }
 
                %
@@ -58,18 +60,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 = #""
@@ -81,15 +83,15 @@
                }
                \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
@@ -99,10 +101,7 @@
                        barNumberScriptPadding = #15
                        %% URG: this changes dynamics too
                        %%textStyle = #"italic"
-                       timeSignatureStyle = #"C"
-                       instrumentScriptPadding = #60  %% urg, this is in pt
-                       instrScriptPadding = #40 %% urg, this is in pt
-                       marginScriptHorizontalAlignment = #1
+                       TimeSignature \override #'style = #'C
                        maximumRestCount = #1
                }
        }