patch::: 1.3.132.jcn1

[lilypond.git] / mutopia / Coriolan / coriolan-paper.ly

diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index 9d33209b23b0b54fd18df07569e497abcc87441f..b281667604e12f3441f981c216bd2e8e3013e746 100644 (file)
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -1,127 +1,55 @@
-\paper{
-       \paper_sixteen
-       textheight = 295.0\mm;
+\version "1.3.120"
+\paper {
+       \paperSixteen
+
+       % Fine for my a4 laserprinter:
+       %textheight = 285.0\mm;
+       %linewidth = 190.0\mm;
+
+       % Mandatory Mutopia settings:
+       textheight = 270.0\mm;
        linewidth = 180.0\mm;
 
-       \translator{ \HaraKiriStaffContext }
-       %
-       % The Voice combine hierarchy
-       %
-       \translator{
+       \translator {
                \ThreadContext
-               \name "VoiceCombineThread";
                \consists "Rest_engraver";
-               \remove "Thread_devnull_engraver";
-               \consists "A2_devnull_engraver";
+               
+               % Set value for engraver at thread level,
+               % to override the default that is set in ScoreContext
+               % for added engraver at Voice level
+               devNullThread = #'()
        }
-       \translator{
+       \translator {
                \VoiceContext
-               \name "VoiceCombineVoice";
-               soloText = #"I."
-               soloIIText = #"II."
                \remove "Rest_engraver";
-               \accepts "VoiceCombineThread";
-               \consists "A2_devnull_engraver";
-               \remove "Voice_devnull_engraver";
-       }
-       \translator{
-               \HaraKiriStaffContext
-               \consists "Mark_engraver";
-               \name "VoiceCombineStaff";
-               \accepts "VoiceCombineVoice";
-       }
 
-       %
-       % The Staff combine hierarchy
-       %
-       \translator{
-               \ThreadContext
-               \name "StaffCombineThread";
-               \remove "Thread_devnull_engraver";
-%%             \consists "A2_devnull_engraver";
-       }
-       \translator{
-               \VoiceContext
-               \name "StaffCombineVoice";
-               \accepts "StaffCombineThread";
-
-               \remove "Rest_engraver";
-               \remove "Dot_column_engraver";
-               \remove "Stem_engraver";
-               \remove "Beam_engraver";
-               \remove "Auto_beam_engraver";
-               %\include "auto-beam-settings.ly";
-
-               \remove "Chord_tremolo_engraver";
-               \remove "Melisma_engraver";
-               \remove "Text_engraver";
-               \remove "A2_engraver";
-               \remove "Voice_devnull_engraver";
-
-               \remove "Piano_pedal_engraver";
-               \remove "Script_engraver";
-               \remove "Script_column_engraver";
-               \remove "Rhythmic_column_engraver";
-               \remove "Slur_engraver";
-               \remove "Tie_engraver";
-
-               \remove "Voice_devnull_engraver";
-%%             \consists "Thread_devnull_engraver";
-               \consists "A2_devnull_engraver";
+               % The staff combine (bassi part) needs a
+               % thread_devnull_engraver here.  Why?
+               % Instead of maintaining two separate hierarchies,
+               % we switch add it, but switch it off immediately.
+               % --> move to Score level to be able to override
+               % The staff combine part switches it on.
+               
+               %% devNullThread = #'never
+               \consists "Thread_devnull_engraver";
        }
        \translator {
                \HaraKiriStaffContext
-               \name "StaffCombineStaff";
-               \accepts "StaffCombineVoice";
-
-               \consists "Rest_engraver";
-               \consists "Dot_column_engraver";
-               \consists "Stem_engraver";
-               \consists "Beam_engraver";
-               \consists "Auto_beam_engraver";
-               \include "auto-beam-settings.ly";
-
-               \consists "Chord_tremolo_engraver";
-               \consists "Melisma_engraver";
-               \consists "Text_engraver";
-               \consists "A2_engraver";
-%%             \consists "Voice_devnull_engraver";
-%%             \consists "A2_devnull_engraver";
-
-               soloADue = ##f
-
-               \consists "Piano_pedal_engraver";
-               \consists "Script_engraver";
-               \consists "Script_column_engraver";
-               \consists "Rhythmic_column_engraver";
-               \consists "Slur_engraver";
-               \consists "Tie_engraver";
-       }
-       \translator {
-               \StaffGroupContext
-               \accepts "VoiceCombineStaff";
-               \accepts "StaffCombineStaff";
+               \consists "Mark_engraver";
+               MultiMeasureRest \override #'minimum-width = #6
        }
-       \translator{ \HaraKiriStaffContext }
-
-       \translator {
-               %\ScoreContext
-               %\consists "Mark_engraver";
+       \translator  {
                \OrchestralScoreContext
-               \accepts "VoiceCombineStaff";
-               \accepts "StaffCombineStaff";
+               % skipBars = ##t 
 
-               barScriptPadding = #2.0 % dimension \pt
-               markScriptPadding = #4.0
-
-               %% urg: in pt?
-               barNumberScriptPadding = #15
-               %% URG: this changes dynamics too
-               %%textStyle = #"italic"
-               timeSignatureStyle = #"C"
-               instrumentScriptPadding = #55  %% urg, this is in pt
-               instrScriptPadding = #40 %% urg, this is in pt
-               marginScriptHorizontalAlignment = #1
-               maximumRestCount = #1
+               soloText = #"I."
+               soloIIText = #"II."
+               % By default, turn off the Thread_devnull_engraver
+               % at Voice level
+               devNullThread = #'never
+               
+               TimeSignature \override #'style = #'C
+               BarNumber \override #'padding = #3
+               RestCollision \override #'maximum-rest-count = #1
        }
 }