From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 6 Feb 2001 16:19:19 +0000 (+0100)
Subject: patch::: 1.3.128.jcn3
X-Git-Tag: release/1.3.129~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2c04bb022510aa76b3b538601ad6df16e296cd4c;p=lilypond.git

patch::: 1.3.128.jcn3
---

diff --git a/VERSION b/VERSION
index 0b5f07b0fc..a8c8385811 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=128
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index 6e6a43e10e..cc2ab866ec 100644
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -1,5 +1,5 @@
 \version "1.3.120"
-\paper{
+\paper {
 	\paperSixteen
 
 	% Fine for my a4 laserprinter:
@@ -10,11 +10,11 @@
 	textheight = 270.0\mm;
 	linewidth = 180.0\mm;
 
-	\translator{
+	\translator {
 		\ThreadContext
 		\consists "Rest_engraver";
 	}
-	\translator{
+	\translator {
 		\VoiceContext
 		\remove "Rest_engraver";
 
@@ -28,11 +28,11 @@
 		%% devNullThread = #'never
 		\consists "Thread_devnull_engraver";
 	}
-	\translator{
+	\translator {
 		\HaraKiriStaffContext
 		\consists "Mark_engraver";
 	}
-	\translator {
+	\translator  {
 		\OrchestralScoreContext
 		% skipBars = ##t 
 
diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index 743641dc13..28c5a86c60 100644
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -1,5 +1,5 @@
 \version "1.3.120"
-\paper{
+\paper {
 	%\paperSixteen
 
 	% Fine for my a4 laserprinter:
@@ -10,11 +10,11 @@
 	textheight = 270.0\mm;
 	linewidth = 180.0\mm;
 
-	\translator{
+	\translator {
 		\ThreadContext
 		\consists "Rest_engraver";
 	}
-	\translator{
+	\translator {
 		\VoiceContext
 		\remove "Rest_engraver";
 
@@ -28,11 +28,14 @@
 		%% devNullThread = #'never
 		\consists "Thread_devnull_engraver";
 	}
-	\translator{
+	% We need the HaraKiri staff for Staff Combining,
+	% but we better remove the Instrument_name_engraver.
+	\translator {
 		\HaraKiriStaffContext
 		\consists "Mark_engraver";
+		\remove "Instrument_name_engraver";
 	}
-	\translator {
+	\translator  {
 		\OrchestralScoreContext
 		skipBars = ##t