From 68a8a2482d9595c1d9855f728c07ca52ea51b3da Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 9 Nov 1998 21:34:36 +0100
Subject: [PATCH] patch::: 1.1.3.jcn4: jcn4

	- GrandStaffContext
---
Generated by janneke@gnu.org using package-diff 0.62,
>From = lilypond-1.1.3.jcn3, To = lilypond-1.1.3.jcn4

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.3.jcn4.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.

--state
1.1.3.jcn3
1.1.3.jcn4
++state
---
 NEWS                            |  9 ++++++++-
 TODO                            |  4 ++++
 VERSION                         |  2 +-
 init/engraver.ly                |  6 ++++--
 input/test/stars-and-stripes.ly | 27 ++++++++++++++++++---------
 lily/paper-def.cc               |  2 +-
 6 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 63e2440d75..83cb1ed697 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
---- ../lilypond-1.1.3.jcn2/NEWS	Mon Nov  9 18:19:50 1998
+--- ../lilypond-1.1.3.jcn3/NEWS	Mon Nov  9 18:07:04 1998
+++ b/NEWS	Mon Nov  9 21:14:59 1998
+@@ -1,4 +1,5 @@
+ pl 3.jcn3
+	- GrandStaffContext
+ 	- mup-to-ly.py: version 0.0
+ 	- init/test/stars-and-stripes.ly (from star.mup)
+ --- ../lilypond-1.1.3.jcn2/NEWS	Mon Nov  9 18:19:50 1998
 ++ b/NEWS	Mon Nov  9 18:07:04 1998
 @@ -1,3 +1,10 @@
 pl 3.jcn3
diff --git a/TODO b/TODO
index bba8e78cd5..fdc4b6febd 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,10 @@ grep for TODO and ugh/ugr/urg
 
 
 BUGS:
+	* repeat bars: strange chars after |: and :|
+
+	* latex bla.tex broken (titles / \lilyfooter stuff?)
+
 	* --safe:  disallow backslashes, disallow \include.
 
 	* fix rounding stuff in number->string
diff --git a/VERSION b/VERSION
index fb1f46ff09..e2ab1a809b 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=3
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/init/engraver.ly b/init/engraver.ly
index 47fb08f7fd..7a656787df 100644
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -103,7 +103,8 @@ VoiceContext = \translator {
 };
 
 \translator {\VoiceContext}
-\translator {
+
+GrandStaffContext=\translator{
 	\type "Line_group_engraver_group";
 	\name GrandStaff;
 	\consists "Span_bar_engraver";
@@ -112,7 +113,8 @@ VoiceContext = \translator {
 	minVerticalAlign = 1.5*\staffheight;
 
 	\accepts "Staff";
-}
+};
+\translator{\GrandStaffContext}
 
 \translator {
 	\type "Line_group_engraver_group";
diff --git a/input/test/stars-and-stripes.ly b/input/test/stars-and-stripes.ly
index 794419800e..b9e03b5b5a 100644
--- a/input/test/stars-and-stripes.ly
+++ b/input/test/stars-and-stripes.ly
@@ -1,12 +1,15 @@
 %{
 Converted from star.mup with the aid of mup-to-ly.py
+http://www.Arkkra.com/.../star.ps
 %}
 \header{
 title="The Star Spangled Banner";
 subtitle="(The United States National Anthem)";
-poet="Text: Francis Scott Key";
-composer="Tune: J. S. Smith";
-arranger="Arr: William J. Krauss";
+poet="Text by Francis Scott Key";
+composer="J. S. Smith";
+arranger="Arranged by William J. Krauss";
+enteredby="jcn";
+copyright="public domain";
 }
 
 $staff1_voice_1 = \notes {
@@ -70,15 +73,16 @@ global = \notes {
 
 \score{ 
 	\type GrandStaff < 
-	        <
 		\type Staff=staffA < 
 			\global
 			\notes \transpose c'' {\voiceone \$staff1_voice_1 } 
 			\notes \transpose c'' {\voicetwo \$staff1_voice_2 } 
 		>
-		\type Lyrics = middle <
-		    	\lyrics \$text1
-			\lyrics { \$text2 \$text3 }
+		\type Lyrics = one \lyrics <
+% urg, too much distance between two texts; fixme first
+%			\$text1
+%			{ \$text2 \$text3 }
+			{ \$text1 \$text3 }
 		>
 		\type Staff=staffB < 
 			\global
@@ -86,9 +90,14 @@ global = \notes {
 			{\voiceone \$staff2_voice_1 } 
 			{\voicetwo \$staff2_voice_2 } 
 		>
-		>
 	>
 	\paper{
-		\include "bar-numbering.ly"
+		\translator {
+				\GrandStaffContext
+				\accepts "Lyrics";
+		}
+		\translator {
+		                \BarNumberingStaffContext
+		}
 	}
 }
diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index c94fe3e8d9..d071415e74 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -251,7 +251,7 @@ output_header (Paper_outputter* p, Scope *head)
 	continue;
       
       String val = *i.val()->access_content_String (false);
-      output_def (p, i.key (), val);
+      output_def (p, "mudela" + i.key (), val);
     }
 }
 
-- 
2.39.5