ly- -> ly:

[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 141c70a7ff86f01950471c7c7bcb4255ea1e487e..64e8f6ad619fdc8d922ac7efd060c8f5f233ef8c 100644 (file)
--- a/input/test/part-combine-staff.ly
+++ b/input/test/part-combine-staff.ly
@@ -1,81 +1,109 @@
+\version "1.7.3"
+
 \score{
        \context PianoStaff <
-               \context Staff=one \skip 1*5;
-               \context Staff=two \skip 1*5;
-               \context Staff=one \partcombine Staff
-                       \context Voice=one \notes\relative c''
+               \context StaffCombineStaff=one \skip 1*7
+               \context StaffCombineStaff=two \skip 1*7
+               \context StaffCombineStaff=one \partcombine StaffCombineStaff
+                       \context StaffCombineVoice=one \notes\relative c''
                                {
                                        c4 d e f\break
                                        c d e f\break
                                        c d e f
                                        c4 d e f\break
                                        a8 a a a b b b b
+                                       a,4 a a a\break
+                                       c2 e4 f\break
                                }
-                       \context Voice=two \notes\relative c''
+                       \context StaffCombineVoice=two \notes\relative c''
                                {
                                        c2 e2
                                        c4 d e f
                                        c2 e2
                                        c,4 d e f
                                        a8 a a a b b b b
+                                       a4 a a a
+                                       c2 e2
                                }
                >
-       \paper{
-               %\translator { \HaraKiriStaffContext }
-               \translator {
-                       \HaraKiriStaffContext
+       \paper {
 
-                       \consists "Rest_engraver";
-                       \consists "Dot_column_engraver";
-                       \consists "Stem_engraver";
-                       \consists "Beam_engraver";
-                       \consists "Auto_beam_engraver";
-                       \include "auto-beam-settings.ly";
+               textheight = 295.0\mm
+               linewidth = 180.0\mm
 
-                       \consists "Chord_tremolo_engraver";
-                       \consists "Melisma_engraver";
-                       \consists "Text_engraver";
-                       \consists "A2_engraver";
-
-                       soloADue = ##f
+               \translator{ \HaraKiriStaffContext }
+               %
+               % The Voice combine hierarchy
+               %
+               \translator{
+                       \ThreadContext
+                       \name "VoiceCombineThread"
+                       \consists "Rest_engraver"
+               }
+               \translator{
+                       \VoiceContext
+                       \name "VoiceCombineVoice"
+                       soloText = #"I."
+                       soloIIText = #"II."
+                       \remove "Rest_engraver"
+                       \accepts "VoiceCombineThread"
+               }
+               \translator{
+                       \HaraKiriStaffContext
+                       \consists "Mark_engraver"
+                       \name "VoiceCombineStaff"
+                       \accepts "VoiceCombineVoice"
+               }
 
-                       \consists "Piano_pedal_engraver";
-                       \consists "Script_engraver";
-                       \consists "Script_column_engraver";
-                       \consists "Rhythmic_column_engraver";
-                       \consists "Slur_engraver";
-                       \consists "Tie_engraver";
+               %
+               % The Staff combine hierarchy
+               %
+               \translator{
+                       \ThreadContext
+                       \name "StaffCombineThread"
                }
                \translator{
                        \VoiceContext
+                       \name "StaffCombineVoice"
+                       \accepts "StaffCombineThread"
+                       \consists "Thread_devnull_engraver"
+               }
+               \translator {
+                       \HaraKiriStaffContext
+                       \name "StaffCombineStaff"
+                       \accepts "StaffCombineVoice"
+
+                       soloADue = ##t
+                       soloText = #""
+                       soloIIText = #""
+                       aDueText = #""
+                       splitInterval = #'(1 . 0)
+                       changeMoment = #`(,(ly:make-moment 1 1) . ,(ly:make-moment 1 1))
+
+               }
+               \translator {
+                       \StaffGroupContext
+                       \accepts "VoiceCombineStaff"
+                       \accepts "StaffCombineStaff"
+               }
+               \translator{ \HaraKiriStaffContext }
 
-                       \remove "Rest_engraver";
-                       \remove "Dot_column_engraver";
-                       \remove "Stem_engraver";
-                       \remove "Beam_engraver";
-                       \remove "Auto_beam_engraver";
-                       %\include "auto-beam-settings.ly";
+               \translator {
+                       \ScoreContext
+                       \accepts "VoiceCombineStaff"
+                       \accepts "StaffCombineStaff"
+                       skipBars = ##t 
 
-                       \remove "Chord_tremolo_engraver";
-                       \remove "Melisma_engraver";
-                       \remove "Text_engraver";
-                       \remove "A2_engraver";
+                       %%% FIXME barScriptPadding = #2.0 % dimension \pt
+                       RehearsalMark \override #'padding = #4
+                       BarNumber \override #'padding = #3
+                       
+                       %% URG: this changes dynamics too
+                       %%textStyle = #"italic"
+                       TimeSignature \override #'style = #'C
 
-                       \remove "Piano_pedal_engraver";
-                       \remove "Script_engraver";
-                       \remove "Script_column_engraver";
-                       \remove "Rhythmic_column_engraver";
-                       \remove "Slur_engraver";
-                       \remove "Tie_engraver";
+                       RestCollision \set #'maximum-rest-count = #1
 
-                       \consists "A2_devnull_engraver";
-                       \consists "Note_heads_engraver";
-               }
-               \translator{
-                       \ThreadContext
-                       \remove "A2_devnull_engraver";
-                       \remove "Note_heads_engraver";
                }
-               linewidth = 40.\mm;
        }
 }