patch::: 1.3.128.jcn3

diff --git a/VERSION b/VERSION
index 0b5f07b0fcc70fc2c2fc7244b8ecb9f045e1c551..a8c83858118d45db8b783fb9fab34f6be002c082 100644 (file)
--- 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 6e6a43e10e9e067316498c24f056bda34fb519f8..cc2ab866ecc28341c264245027bac608f71b2c77 100644 (file)
--- 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 743641dc13cd9e9b8afbe3e4772833793b31d1c1..28c5a86c60f240048e7a252a6e1cc46de5bc7159 100644 (file)
--- 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