From: fred Date: Wed, 27 Mar 2002 00:48:51 +0000 (+0000) Subject: lilypond-1.3.129 X-Git-Tag: release/1.5.59~941 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=21cf303724c81983aac16859858dcf41284f5bc6;p=lilypond.git lilypond-1.3.129 --- diff --git a/input/bugs/score-dynamics.ly b/input/bugs/score-dynamics.ly index 2c4a6500e1..9389c525a9 100644 --- a/input/bugs/score-dynamics.ly +++ b/input/bugs/score-dynamics.ly @@ -16,104 +16,79 @@ contrabasso = \notes\relative c'' { c2\pp c d1 e } -flautiStaff = \notes \context VoiceCombineStaff = flauti < - \context VoiceCombineVoice=oneBassi \End - \context VoiceCombineVoice=twoBassi \End - \context VoiceCombineVoice=Flauti \partcombine VoiceCombineVoice - \context VoiceCombineThread=oneFlauti \violoncello - \context VoiceCombineThread=twoFlauti \contrabasso +flautiStaff = \notes \context Staff = flauti < + \context Voice=oneBassi \End + \context Voice=twoBassi \End + \context Voice=Flauti \partcombine Voice + \context Thread=oneFlauti \violoncello + \context Thread=twoFlauti \contrabasso > +staffCombineProperties = { + \property Voice.devNullThread = #'unisolo + \property Voice.soloADue = ##t + \property Voice.soloText = #"" + \property Voice.soloIIText = #"" + % This is non-conventional, but currently it is + % the only way to tell the difference. + \property Voice.aDueText = #"\\`a2" + \property Voice.splitInterval = #'(1 . 0) + \property Voice.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) +} \score { < \flautiStaff \context PianoStaff = bassi_group \notes < - \context StaffCombineStaff=oneBassi \End - \context StaffCombineStaff=twoBassi \End + \context Staff=oneBassi \End + \context Staff=twoBassi \End - \context StaffCombineStaff=oneBassi \partcombine StaffCombineStaff - \context StaffCombineVoice=oneBassi \violoncello - \context StaffCombineVoice=twoBassi \contrabasso + \context Staff=oneBassi \partcombine Staff + \context Voice=oneBassi { \staffCombineProperties \violoncello } + \context Voice=twoBassi { \staffCombineProperties \contrabasso } > - > - \paper{ + > + \paper { % \paperSixteen - - %textheight = 290.0\mm; - %linewidth = 195.0\mm; - textheight = 285.0\mm; - linewidth = 190.0\mm; - - \translator{ \HaraKiriStaffContext } - % - % The Voice combine hierarchy - % + linewidth = 80 * \staffspace; + textheight = 200 * \staffspace; \translator{ \ThreadContext - \name "VoiceCombineThread"; \consists "Rest_engraver"; } \translator{ \VoiceContext - \name "VoiceCombineVoice"; + \remove "Rest_engraver"; + + % The staff combine (bassi part) needs a + % thread_devnull_engraver here. + % Instead of maintaining two separate hierarchies, + % we switch add it, but switch it off immideately. + % The staff combine parts switch it on. + devNullThread = #'never + \consists "Thread_devnull_engraver"; + soloText = #"I." soloIIText = #"II." - \remove "Rest_engraver"; - \accepts "VoiceCombineThread"; + soloADue = ##f } \translator{ \HaraKiriStaffContext \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 { - \HaraKiriStaffContext - \name "StaffCombineStaff"; - \accepts "StaffCombineVoice"; - - soloADue = ##t - soloText = #"" - soloIIText = #"" - % This is non-conventional, but currently it is - % the only way to tell the difference. - aDueText = #"\\`a2" - splitInterval = #'(1 . 0) - changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) } \translator { - \StaffGroupContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; - } - \translator{ \HaraKiriStaffContext } - - \translator { - %\ScoreContext \OrchestralScoreContext - \accepts "VoiceCombineStaff"; - \accepts "StaffCombineStaff"; - TimeSignature \override #'style = #'C - skipBars = ##t + skipBars = ##t + % Hmm + currentBarNumber = #218 BarNumber \override #'padding = #3 RestCollision \override #'maximum-rest-count = #1 + marginScriptHorizontalAlignment = #1 + TimeSignature \override #'style = #'C } + \translator { \HaraKiriStaffContext } } } + diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly index 8c48cd1780..d25e2391c6 100644 --- a/input/regression/allfontstyle.ly +++ b/input/regression/allfontstyle.ly @@ -12,6 +12,6 @@ f4-\ff^""^"Largo" \mark "B"; g } \paper { linewidth = -1.0; - \translator { \BarNumberingStaffContext} + % \translator {\BarNumberingStaffContext} } } } diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 502045ed54..e0617c0acc 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -12,8 +12,6 @@ texidoc="Bar number settable and padding adjustable."; } \paper { linewidth = 40*\staffspace; - \translator { - \BarNumberingStaffContext - } + % \translator { \BarNumberingStaffContext } } } diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 644550de3f..7808e156f1 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -24,7 +24,8 @@ grstaff = \notes \context GrandStaff < > scpaper = \paper {\translator {\OrchestralScoreContext}} -stpaper = \paper{ \translator {\BarNumberingStaffContext }} +% stpaper = \paper{ \translator {\BarNumberingStaffContext }} +stpaper = \paper{ } scscore = \score { \grstaff \paper { \scpaper diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index ef7760a61a..acec5f0502 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -18,7 +18,7 @@ copyright = "Public Domain"; \score{ \violaIStaff \paper{ - \translator { \BarNumberingStaffContext } + %\translator { \BarNumberingStaffContext } } \midi{ %urg, real/duration @@ -36,7 +36,7 @@ copyright = "Public Domain"; \violaIiStaff \paper{ % castingalgorithm=0.0; - \translator { \BarNumberingStaffContext } + %\translator { \BarNumberingStaffContext } %\translator { \ScoreContext skipBars = 1; } } \midi{ diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index 1e72b403be..4f535e7fd8 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -18,7 +18,7 @@ copyright = "Public Domain"; \score{ \violinoIStaff \paper{ - \translator { \BarNumberingStaffContext } + %\translator { \BarNumberingStaffContext } } \midi{ % \tempo 4. = 69; @@ -34,7 +34,7 @@ copyright = "Public Domain"; \score{ \violinoIiStaff \paper{ - \translator { \BarNumberingStaffContext } + %\translator { \BarNumberingStaffContext } % castingalgorith=0; } \midi{ diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index 26449b6eca..ba58376170 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -18,7 +18,7 @@ copyright = "Public Domain"; \score{ \violoncelloIStaff \paper{ - \translator { \BarNumberingStaffContext } + %\translator { \BarNumberingStaffContext } } \midi{ %urg, real/duration @@ -36,7 +36,7 @@ copyright = "Public Domain"; \violoncelloIiStaff \paper{ %castingalgorithm=0.; - \translator { \BarNumberingStaffContext } + %\translator { \BarNumberingStaffContext } } \midi{ % \tempo 2 = 96; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly index b592904068..04f1bf6d1f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/solo-cello-suite-ii.ly @@ -2,7 +2,7 @@ \paper { linewidth = 180.\mm; -\translator { \BarNumberingStaffContext } +% \translator { \BarNumberingStaffContext } } % \include "prelude-" + \instr + ".ly";