From: fred <fred>
Date: Tue, 26 Mar 2002 22:42:01 +0000 (+0000)
Subject: lilypond-1.2.15
X-Git-Tag: release/1.5.59~2045
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=821100fa8a163406ac41826eb60b8f05c91bc78d;p=lilypond.git

lilypond-1.2.15
---

diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly
index 51b3ba5798..627d3cc47a 100644
--- a/mutopia/F.Schubert/standchen.ly
+++ b/mutopia/F.Schubert/standchen.ly
@@ -1,5 +1,14 @@
 \header{
 filename =	 "standchen.ly";
+%
+% From the album:
+% Schubert-Lieder
+% Edition Schott No. 608
+% Without date, but makes mention of
+% ``Jubil"aums-Ausgabe zum 100. Todestage'' ie, 1928
+%
+% page 60
+%
 title    = "St\\\"andchen";
 subtitle = "(Serenade)\\\\``Leise flehen meine Lieder''";
 opus =	 "D. 957 No. 4";
@@ -8,6 +17,22 @@ composer =	 "Franz Schubert (1797-1828)";
 poet=	 "Text by Ludwig Rellstab (1799-1860)";
 enteredby =	 "JCN";
 copyright =	 "public domain";
+
+  % mutopia headers.
+  mutopiatitle = "St\\\"andchen";
+  mutopiasubtitle = "(Serenade)\\\\``Leise flehen meine Lieder''";
+  mutopiacomposer = "Franz Schubert (1797-1828)";
+  mutopiapoet = "Ludwig Rellstab (1799-1860)";
+  mutopiaopus = "D. 957 No. 4";
+  mutopiainstrument = "Piano";
+  style = "Romantic";
+  copyright = "Public Domain";
+  tagline =    "\\\\This music is part of the Mutopia project, http://sca.uwater
+loo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Jan Nieuwenhuizen.\\\\Unrestricted modification and redistribution is permitted and enc
+ouraged - copy this music and share it!";
+  maintainer = "janneke@gnu.org";
+  lastupdated = "1999/Oct/17";
+
 } 
 
 %{
diff --git a/mutopia/N.W.Gade/README b/mutopia/N.W.Gade/README
index fbffbfc7e5..dbd16551f6 100644
--- a/mutopia/N.W.Gade/README
+++ b/mutopia/N.W.Gade/README
@@ -11,13 +11,16 @@ The piece was performed in Ludvika and 
 March 13-14, 1999, by Bergslagens Kammarsymfoniker conducted 
 by Ola Karlsson.
 
+The piece is for a small symphony orchestra with (using standard
+notation for orchestral settings): 1121-2200-10-strings
+
 Christian Mondrup has provided the following background on the
 piece: 
 It was composed 1850 as a ouverture for the comedy "Imellem 
-Fjeldene" by the danish poet Carsten Hauch. In the Andante 
+Fjeldene" by the Danish poet Carsten Hauch. In the Andante 
 introduction, Gade uses a melody from the collection ``Norske 
 Folkesagn og Melodier'' (``Norwegian folksongs and melodies'') 
-by the danish composer A.P. Bergreen. The song has a norwegian 
+by the Danish composer A.P. Bergreen. The song has a Norwegian 
 text ``Heimreise fraa Sæteren'' by Edvard Storm. The second 
 theme of the Allegro part might very well come from the same
 collection, namely the song ``Saag du nokke Kjærringa mi''.
diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly
index 9094208b4a..34deb5ed7c 100644
--- a/mutopia/N.W.Gade/brass.ly
+++ b/mutopia/N.W.Gade/brass.ly
@@ -203,13 +203,13 @@ R2 |
 e4 \fz r
 }
 
-corIhelp=\notes\relative c''' {
+corIcue=\notes\relative c''' {
 \key c;
 \tiny
 
 s2.*32 |
 s2*33 | \stemup
-r4 r8 [g16^"oboe" \p ( a ] |
+r4 r8 [g16^"oboe" ( a ] |
 [ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] |
 [ ) f8-. e16 ( f ] ) e8-. s | \stemboth
 s2*66 |
@@ -219,7 +219,7 @@ s2*66 |
 ) e4 r |
 }
 
-corIIhelp=\notes\relative c'' {
+corIIcue=\notes\relative c'' {
 \key c;
 \tiny
 
@@ -517,7 +517,7 @@ R2 |
 g4 \fz r
 }
 
-trpIhelp=\notes\relative c'' {
+trpIcue=\notes\relative c'' {
 \tiny
 
 s2.*32 |
@@ -545,7 +545,7 @@ r4^"Flauto" r8 [c'16 ( d] |
 )bes8 [a16 ( bes ] ) a8 
 }
 
-trpIIhelp=\notes\relative c'' {
+trpIIcue=\notes\relative c'' {
 \tiny
 
 [c8.^"Oboe" ( d16] ) c2 |
@@ -845,7 +845,7 @@ r2 |
 f4 \fz r 
 }
 
-timphelp=\notes\relative c' {
+timpcue=\notes\relative c' {
 \tiny
 
 [c8.^"Oboe, \\okt" ( d16] ) c2 |
diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly
index f9326fc155..d6181f7dd5 100644
--- a/mutopia/N.W.Gade/parts.ly
+++ b/mutopia/N.W.Gade/parts.ly
@@ -43,7 +43,7 @@ my_paper = \paper {
       \marks
       \flauto
     >
-    \context Voice = help \flautohelp
+    \context Voice = cue \flautocue
   >
   \header{
     instrument = "Flauto";
@@ -64,7 +64,7 @@ my_paper = \paper {
       \marks
       \oboe
     >
-    \context Voice = help \oboehelp
+    \context Voice = cue \oboecue
   >
   \header{
     instrument = "Oboe";
@@ -139,7 +139,7 @@ my_paper = \paper {
       \marks
       \corI
     >
-    \context Voice = help \corIhelp
+    \context Voice = cue \corIcue
   >
   \header{
     instrument = "Corno I in F";
@@ -160,7 +160,7 @@ my_paper = \paper {
       \marks
       \corII
     >
-    \context Voice = help \corIIhelp
+    \context Voice = cue \corIIcue
   >
   \header{
     instrument = "Corno II in F";
@@ -181,7 +181,7 @@ my_paper = \paper {
       \marks
       \trpI
       >
-    \context Voice = help \trpIhelp
+    \context Voice = cue \trpIcue
   >
   \header{
     instrument = "Tromba I in B\\textflat";
@@ -202,7 +202,7 @@ my_paper = \paper {
       \marks
       \trpII
     >
-    \context Voice = help \trpIIhelp
+    \context Voice = cue \trpIIcue
   >
   \header{
     instrument = "Tromba II in B\\textflat";
@@ -223,7 +223,7 @@ my_paper = \paper {
       \marks
       \timpani
     >
-    \context Voice = help \timphelp
+    \context Voice = cue \timpcue
   >
   \header{
     instrument = "Timpani \& Triangolo";
diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly
index 9daff0680a..7680cffced 100644
--- a/mutopia/N.W.Gade/score.ly
+++ b/mutopia/N.W.Gade/score.ly
@@ -135,8 +135,7 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
         markScriptPadding = "20.0";
     }
     \translator { 
-%        \HaraKiriStaffContext % Gives lost bar lines and misplaced marks!!
-        \StaffContext
+        \HaraKiriStaffContext 
 	\consists "Staff_margin_engraver";
         marginScriptPadding = "15.0";
         dynamicPadding = 3.0;
diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly
index 8df8e869f5..0e17a3a0dd 100644
--- a/mutopia/N.W.Gade/strings.ly
+++ b/mutopia/N.W.Gade/strings.ly
@@ -566,7 +566,7 @@ vla=\notes\relative c' {
 \property Staff."midiInstrument" = "viola"
 
 [c8. \f ( d16 ] ) c2_"dim." |
-\context Staff <{\voiceone s4 c2 |
+\context Staff <{\voiceone [c8. d16 ] c2 |
   c2. ~ |
   c2. ~ |
   c2. ~ |
diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly
index 0221e01cc5..84a5062b90 100644
--- a/mutopia/N.W.Gade/wood.ly
+++ b/mutopia/N.W.Gade/wood.ly
@@ -471,7 +471,7 @@ fis \> ~ | % cresc. added
 \! fis4 r | % dim. added
 R2*4 |
 e'2 \fz \> ( |
-) \! fis,4 r |
+) fis,4 \! r |
 b2 \> ( |
 ) \! ais4 r |
 fis2 \pp \< ~ |
@@ -480,7 +480,7 @@ fis \> ~ |
 \! fis4 r |
 R2*4 |
 e'2 \fz \> ( |
-) \! fis,4 r |
+) fis,4 \! r |
 e'2 \p ( |
 ) ais, |
 R2*2 |
@@ -902,7 +902,7 @@ e2 \p \< ~ |
 \! e \< ~ |
 \! e \> |
 \grace d'8 ( )  \! f2 \fz \> ( |
-) \! e4. r8 |
+) e4. \! r8 |
 f,2 \> ( ( |
 [ ) \! e8 d c ) b ] | 
 a2 \pp \< ~ |
@@ -914,7 +914,7 @@ e ~ |
 e ~ |
 e |
 \grace d'8 ( ) f2 \fz \> ( |
-) \! e4. r8 |
+) e4. \! r8 |
 f,2 \p ( |
 ) e4 r |
 f'2-> ( |
@@ -1033,7 +1033,7 @@ f ( |
 ) c'4 \fz r
 }
 
-oboehelp=\notes\relative c'' {
+oboecue=\notes\relative c'' {
 \tiny
 
 s2.*32 |
@@ -1045,7 +1045,7 @@ s2*106 |
 [e c ) d] s |
 }
 
-flautohelp=\notes\relative c'' {
+flautocue=\notes\relative c'' {
 \tiny
 
 s2.*32 |