* input/test/figured-bass-alternative.ly: fix accidental.

[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 0e69ad05b4b5133e886adc62e3f93564be777908..3b6226fda4b4cb4f5dbb749c080631248f198fd5 100644 (file)
--- a/input/test/part-combine-staff.ly
+++ b/input/test/part-combine-staff.ly
@@ -1,7 +1,13 @@
+
+\version "2.1.7"
+\header { texidoc = "@cindex Part Combine Staff
+You can combine parts on two staffs, as well as two voices. "
+}
+
 \score{
-       \context PianoStaff <
-               \context StaffCombineStaff=one \skip 1*7;
-               \context StaffCombineStaff=two \skip 1*7;
+       \context PianoStaff <<
+               \context StaffCombineStaff=one \skip 1*7
+               \context StaffCombineStaff=two \skip 1*7
                \context StaffCombineStaff=one \partcombine StaffCombineStaff
                        \context StaffCombineVoice=one \notes\relative c''
                                {
@@ -23,34 +29,33 @@
                                        a4 a a a
                                        c2 e2
                                }
-               >
+               >>
        \paper {
+               textheight = 295.0\mm
+               linewidth = 180.0\mm
 
-               textheight = 295.0\mm;
-               linewidth = 180.0\mm;
-
-               \translator{ \HaraKiriStaffContext }
+               \translator{ \RemoveEmptyStaffContext }
                %
                % The Voice combine hierarchy
                %
                \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";
+                       \RemoveEmptyStaffContext
+                       \consists "Mark_engraver"
+                       \name "VoiceCombineStaff"
+                       \accepts "VoiceCombineVoice"
                }
 
                %
@@ -58,49 +63,51 @@
                %
                \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";
+                       \RemoveEmptyStaffContext
+                       \name "StaffCombineStaff"
+                       \accepts "StaffCombineVoice"
 
                        soloADue = ##t
                        soloText = #""
                        soloIIText = #""
                        aDueText = #""
                        splitInterval = #'(1 . 0)
-                       changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
+                       changeMoment = #`(,(ly:make-moment 1 1) . ,(ly:make-moment 1 1))
 
                }
                \translator {
                        \StaffGroupContext
-                       \accepts "VoiceCombineStaff";
-                       \accepts "StaffCombineStaff";
+                       \accepts "VoiceCombineStaff"
+                       \accepts "StaffCombineStaff"
                }
-               \translator{ \HaraKiriStaffContext }
+               \translator{ \RemoveEmptyStaffContext }
 
                \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
+
                }
        }
 }
+