* input/regression/pc-mmrest.ly (two): remove file.
2004-02-02 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * input/regression/pc-switch-slur.ly (texidoc): remove file.
+
+ * input/test/part-combine-{moment,staff}.ly: remove file.
+
+ * input/regression/pc-mmrest.ly (two): remove file.
+
* scm/define-music-types.scm (music-descriptions): add
Solo{One,Two}Event and UnisonoEvent
\header {
texidoc = "Partcombiner and grace notes can go together."
}
- \paper { raggedright= ##t }
+
+\paper { raggedright= ##t }
\score {
- \new StaffGroup <<
- \new Staff <<
- \context Voice=one \partcombine Voice
- \context Thread=one \notes \relative c'' {
+ \new Staff
+ \newpartcombine
+ \notes \relative c'' {
c4 d e f \grace f16 g1
}
- \context Thread=two \notes \relative c' {
+ \notes \relative c' {
c4 d e2 g1
}
- >>
- >>
+
+
}
+++ /dev/null
-
-\version "2.1.7"
-\header {
-texidoc="Multi measure rests of second voice should not disappear."
-}
-
-
-%{
-
-TODO: what does this test? The contexts are tweaked too much.
-
-%}
-
-#(ly:set-point-and-click 'line-column)
-one = \notes\relative c'' {
-
- f4 e\!-.\f r2|
- R1|
- f2\p(es )|
- d1\<|
- d1|
- d2 d2|
- d2 d2|
- f1\!\ff |
- f1
-}
-
-two = \notes \relative c'' {
- r4 c r2|
- R1*6|
- c1 ~|
- c1
-}
-
-\score {
- \notes <<
- \context Staff = Viole <<
- \context Voice=one \partcombine Voice
- \context Thread=one \one
- \context Thread=two \two
- >>
- >>
- \paper {
- \translator {
- \ThreadContext
- \consists "Rest_engraver"
- }
- \translator {
- \VoiceContext
- \remove "Rest_engraver"
- \consists Multi_measure_rest_engraver
- \consists Bar_engraver
- }
- \translator {
- \RemoveEmptyStaffContext
- \remove Multi_measure_rest_engraver
- \remove Bar_engraver
- }
- \translator {
- \OrchestralScoreContext
- RestCollision \override #'maximum-rest-count = #1
- }
- }
-}
+++ /dev/null
-
-\version "2.1.7"
-\header{
-texidoc="The partcombiner should not combine two small slurs into a big one."
-}
-
-\score{
- \context Staff <<
- \context Voice=one\skip 1
- \context Voice=two\skip 1
- \context Voice=one \partcombine Voice
- \context Thread=one \notes\relative c'' {
- c4( c b a)
- a( b c d)
- }
- \context Thread=two \notes\relative c'' {
- a4( c b a)
- a( b c a)
-
- }
- >>
- \paper{
- linewidth=140.\mm
- }
-}
-
-
-
+++ /dev/null
-
-\version "2.1.7"
-% TODO: this example has a ton of text for very little output.
-% Is it all needed? -gp
-% should this go to regression or be delete'd? -gp
-\header{ texidoc="@cindex Part Combine Moments
-When you combine two voices with the same notes, you should
-only have one stem. "
-}
-
-\score{
- \context PianoStaff <<
- \context StaffCombineStaff=one \skip 1*2
- \context StaffCombineStaff=two \skip 1*2
- \context StaffCombineStaff=one \partcombine StaffCombineStaff
- \context StaffCombineVoice=one \notes\relative c''
- {
- c4 d e f\break
- c2 e4 f\break
- }
- \context StaffCombineVoice=two \notes\relative c''
- {
- c4 d e f
- c2 e2
- }
- >>
- \paper {
- raggedright= ##t
- textheight = 295.0\mm
- linewidth = 180.0\mm
-
- \translator{ \RemoveEmptyStaffContext }
- %
- % 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{
- \RemoveEmptyStaffContext
- \consists "Mark_engraver"
- \name "VoiceCombineStaff"
- \accepts "VoiceCombineVoice"
- }
-
- %
- % The Staff combine hierarchy
- %
- \translator{
- \ThreadContext
- \name "StaffCombineThread"
- }
- \translator{
- \VoiceContext
- \name "StaffCombineVoice"
- \accepts "StaffCombineThread"
- \consists "Thread_devnull_engraver"
- }
- \translator {
- \RemoveEmptyStaffContext
- \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{ \RemoveEmptyStaffContext }
-
- \translator {
- \ScoreContext
- \accepts "VoiceCombineStaff"
- \accepts "StaffCombineStaff"
- skipBars = ##t
-
- RehearsalMark \override #'padding = #4
- BarNumber \override #'padding = #3
- TimeSignature \override #'style = #'C
- RestCollision \set #'maximum-rest-count = #1
- }
- }
-}
-
+++ /dev/null
-
-\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 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 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 {
- textheight = 295.0\mm
- linewidth = 180.0\mm
-
- \translator{ \RemoveEmptyStaffContext }
- %
- % 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{
- \RemoveEmptyStaffContext
- \consists "Mark_engraver"
- \name "VoiceCombineStaff"
- \accepts "VoiceCombineVoice"
- }
-
- %
- % The Staff combine hierarchy
- %
- \translator{
- \ThreadContext
- \name "StaffCombineThread"
- }
- \translator{
- \VoiceContext
- \name "StaffCombineVoice"
- \accepts "StaffCombineThread"
- \consists "Thread_devnull_engraver"
- }
- \translator {
- \RemoveEmptyStaffContext
- \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{ \RemoveEmptyStaffContext }
-
- \translator {
- \ScoreContext
- \accepts "VoiceCombineStaff"
- \accepts "StaffCombineStaff"
- skipBars = ##t
-
- %%% 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
-
- RestCollision \set #'maximum-rest-count = #1
-
- }
- }
-}
-
projects / lilypond.git / commitdiff