From: fred <fred>
Date: Wed, 27 Mar 2002 00:48:54 +0000 (+0000)
Subject: lilypond-1.3.129
X-Git-Tag: release/1.5.59~938
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aacb49117f336cd637cba6b2381fab88116379d5;p=lilypond.git

lilypond-1.3.129
---

diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index 60d89d56e5..cc2ab866ec 100644
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -1,76 +1,45 @@
 \version "1.3.120"
-\paper{
+\paper {
 	\paperSixteen
 
-	%textheight = 290.0\mm;
-	%linewidth = 195.0\mm;
-	textheight = 285.0\mm;
-	linewidth = 190.0\mm;
+	% Fine for my a4 laserprinter:
+	%textheight = 285.0\mm;
+	%linewidth = 190.0\mm;
 
-	\translator{ \HaraKiriStaffContext }
-	%
-	% The Voice combine hierarchy
-	%
-	\translator{
+	% Mandatory Mutopia settings:
+	textheight = 270.0\mm;
+	linewidth = 180.0\mm;
+
+	\translator {
 		\ThreadContext
-		\name "VoiceCombineThread";
 		\consists "Rest_engraver";
 	}
-	\translator{
+	\translator {
 		\VoiceContext
-		\name "VoiceCombineVoice";
-		soloText = #"I."
-		soloIIText = #"II."
 		\remove "Rest_engraver";
-		\accepts "VoiceCombineThread";
-	}
-	\translator{
-		\HaraKiriStaffContext
-		\consists "Mark_engraver";
-		\name "VoiceCombineStaff";
-		\accepts "VoiceCombineVoice";
-	}
 
-	%
-	% The Staff combine hierarchy
-	%
-	\translator{
-		\ThreadContext
-		\name "StaffCombineThread";
-	}
-	\translator{
-		\VoiceContext
-		\name "StaffCombineVoice";
-		\accepts "StaffCombineThread";
+		% 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 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";
-
-		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";
+		\consists "Mark_engraver";
 	}
-	\translator{ \HaraKiriStaffContext }
-
-	\translator {
-		%\ScoreContext
+	\translator  {
 		\OrchestralScoreContext
-		\accepts "VoiceCombineStaff";
-		\accepts "StaffCombineStaff";
-		skipBars = ##t 
+		% skipBars = ##t 
+
+		soloText = #"I."
+		soloIIText = #"II."
+		devNullThread = #'never
+		
 		TimeSignature \override #'style = #'C
 		BarNumber \override #'padding = #3
 		RestCollision \override #'maximum-rest-count = #1
diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index 3b362e9041..28c5a86c60 100644
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -1,14 +1,48 @@
 \version "1.3.120"
 \paper {
-	textheight = 295.0\mm;
+	%\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 }
+	\translator {
+		\ThreadContext
+		\consists "Rest_engraver";
+	}
+	\translator {
+		\VoiceContext
+		\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 immediately.
+		% --> move to Score level to be able to override
+		% The staff combine part switches it on.
+		
+		%% devNullThread = #'never
+		\consists "Thread_devnull_engraver";
+	}
+	% We need the HaraKiri staff for Staff Combining,
+	% but we better remove the Instrument_name_engraver.
 	\translator {
-		\ScoreContext
-		%\OrchestralScoreContext
+		\HaraKiriStaffContext
+		\consists "Mark_engraver";
+		\remove "Instrument_name_engraver";
+	}
+	\translator  {
+		\OrchestralScoreContext
 		skipBars = ##t 
+
+		soloText = #"I."
+		soloIIText = #"II."
+		devNullThread = #'never
+		
 		TimeSignature \override #'style = #'C
 		BarNumber \override #'padding = #3
 		RestCollision \override #'maximum-rest-count = #1