From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 19 Mar 1999 12:55:16 +0000 (+0100)
Subject: patch::: 1.1.36.mb1: forwarded message from Mats Bengtsson
X-Git-Tag: release/1.1.37~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6a89364b5660bc6ee08071c0e7f083b4c637667c;p=lilypond.git

patch::: 1.1.36.mb1: forwarded message from Mats Bengtsson

pl 36.mb1
	- bf: N.W.Gade
---

diff --git a/NEWS b/NEWS
index ab43ab8884..ab116dcc2c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl 36.mb1
+	- bf: N.W.Gade
+
 pl 35.uu1
 	- more memory tweaks: don't do Score_element::line_l () when deleting lines.
 	- more generic properties.
diff --git a/VERSION b/VERSION
index de8033e122..bba7d95450 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=36
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly
index 8bd9665751..e61ea9bb12 100644
--- a/mutopia/N.W.Gade/brass.ly
+++ b/mutopia/N.W.Gade/brass.ly
@@ -13,7 +13,7 @@ c2. \p ( |
 ) g4 [g8. ( a16 ] ) g4 |
 c2. \p ( |
 ) g2 g4 |
-\tiny g8*1/2 \normalsize c2 \< ( *7/8 ~ [ \! c8 \> \! ) g ] | % grace note g8 c2
+\tiny g8*1/2 \normalsize c2 \< ( *7/8 ~ [ \! c8 \> \! ) g ] |
 g2 \p r4 |
 g \mf ( d' c~ |
 c ) b r |
@@ -23,7 +23,7 @@ r4 r c \p ( |
 g [g8. ( a16 ] ) g4 |
 R2. |
 r4 r [g8^""^"solo" \mf \< () \! e' ] |
-\tiny d8*1/2 \normalsize g2 \> ( *7/8 [ \! e8. c16 ] | % grace note d8 g2
+\tiny d8*1/2 \normalsize g2 \> ( *7/8 [ \! e8. c16 ] |
 ) g2 r4 |
 R2. |
 r4 r \times 2/3 {[e'8 \f ( g, ) g'] } |
@@ -32,7 +32,7 @@ r r \times 2/3 {[g8 \f ( e ) g] }
 d4 () g r |
 r r [d16 \f ( g, e' d ] |
 [g, d' e ) d ] g,4 r |
-r \tiny g8 \f *1/2 \normalsize d'2 \> ( *7/8| % grace note g8 d2
+r \tiny g8 \f *1/2 \normalsize d'2 \> ( *7/8|
 [g,8. a16 g8. a16 \! g8. ) a16 ] |
 g4 r r |
 R2. |
@@ -251,7 +251,7 @@ corII=\notes\relative c'' {
 
 R2.*19 |
 r4 r [g8^"solo" \p (\< \! ) e'] |
-\tiny d8*1/2 \normalsize g2 \> ( *7/8 [e8. ) \! c16 ] | % grace note d8 () g2
+\tiny d8*1/2 \normalsize g2 \> ( *7/8 [e8. ) \! c16 ] |
 g2 r 4 |
 r r \times 2/3 {[e'8 \p ( g, ) g' ]} |
 g4 \> () \! e r |
diff --git a/mutopia/N.W.Gade/global.tex b/mutopia/N.W.Gade/global.tex
index 13015a5e4c..0fa5588102 100644
--- a/mutopia/N.W.Gade/global.tex
+++ b/mutopia/N.W.Gade/global.tex
@@ -26,7 +26,7 @@
 \lhead{\textbf{\large\theinstrument}}
 \chead{}
 \lfoot{}
-\cfoot{\ifnum\thepage=1{\thecopyright\hfill\LilyIdString}\fi}
+\cfoot{\ifnum\thepage=1{\thecopyright\hfill\mudelatagline}\fi}
 \rfoot{\ifnum\thepage>1{\hfill\thepage\hfill}\fi}
 \headrulewidth0mm
 \pagestyle{fancy}
diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly
index 7491098fda..70e425f0a5 100644
--- a/mutopia/N.W.Gade/parts.ly
+++ b/mutopia/N.W.Gade/parts.ly
@@ -29,9 +29,11 @@ my_paper = \paper {
     SkipBars = 1;
     markScriptPadding = "6.0";
     textstyle = "italic";
+    textEmptyDimension = 1;
+    oldTieBehavior = 1;
   }
 }
-%{
+
 \score{
   \type Staff <
     \global
@@ -43,7 +45,7 @@ my_paper = \paper {
     instrument = "Oboe";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "oboe";
   }
   \midi {
@@ -62,7 +64,7 @@ my_paper = \paper {
     instrument = "Flauto";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "flauto";
   }
   \midi {
@@ -80,7 +82,7 @@ my_paper = \paper {
     instrument = "Clarinetto I in B\\textflat";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "clarI";
   }
   \midi {
@@ -98,7 +100,7 @@ my_paper = \paper {
     instrument = "Clarinetto II in B\\textflat";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "clarII";
   }
   \midi {
@@ -116,7 +118,7 @@ my_paper = \paper {
     instrument = "Fagotto";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "fagotto";
   }
   \midi {
@@ -135,14 +137,14 @@ my_paper = \paper {
     instrument = "Corno I in F";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "corI";
   }
   \midi {
     \tempo 4=120;
   }
 }
-%}
+
 \score{
   \type Staff <
     \globalNoKey
@@ -154,14 +156,14 @@ my_paper = \paper {
     instrument = "Corno II in F";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "corII";
   }
   \midi {
     \tempo 4=120;
   }
 }
-%{
+
 \score{
   \type Staff <
     \globalNoKey
@@ -173,7 +175,7 @@ my_paper = \paper {
     instrument = "Tromba I in B\\textflat";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "trpI";
   }
   \midi {
@@ -192,7 +194,7 @@ my_paper = \paper {
     instrument = "Tromba II in B\\textflat";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "trpII";
   }
   \midi {
@@ -211,7 +213,7 @@ my_paper = \paper {
     instrument = "Timpani";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "timpani";
   }
   \midi {
@@ -229,7 +231,7 @@ my_paper = \paper {
     instrument = "Violino I";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "viI";
   }
   \midi {
@@ -241,14 +243,13 @@ my_paper = \paper {
   \type Staff <
     \global
     \marks
-%    \notes{s2.*32 s2*141 \break}
     \viII
   >
   \header{
     instrument = "Violino II";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "viII";
   }
   \midi {
@@ -267,7 +268,7 @@ my_paper = \paper {
     instrument = "Viola";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "viola";
   }
   \midi {
@@ -285,7 +286,7 @@ my_paper = \paper {
     instrument = "Violoncello";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "violoncello";
   }
   \midi {
@@ -303,11 +304,10 @@ my_paper = \paper {
     instrument = "Contrabasso";
   }
   \paper{
-    \my_paper;
+    \my_paper
     output = "cb";
   }
   \midi {
     \tempo 4=120;
   }
 }
-%}
\ No newline at end of file
diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly
index b48b6d279c..46e22ec750 100644
--- a/mutopia/N.W.Gade/score.ly
+++ b/mutopia/N.W.Gade/score.ly
@@ -35,13 +35,13 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
     \type Staff = clarI <
       \property Staff.instrument = "Clarinetto I"
       \property Staff.instr = "Cl. I"
-      \global
+      \globalNoKey
       \clarI
     >
     \type Staff = clarII <
       \property Staff.instrument = "Clarinetto II"
       \property Staff.instr = "Cl. II"
-      \global
+      \globalNoKey
       \clarII
     >
     \type Staff = fagotto <
@@ -53,14 +53,14 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
   >
   \type StaffGroup = brass <
     \type Staff = cor <
-      \global
+      \globalNoKey
       \property Staff.instrument = "2 Corni in F"
       \property Staff.instr = "Cor."
       \type Voice = corI { \stemup \corI }
       \type Voice = corII { \stemdown \corII }
     >
     \type Staff = trp <
-      \global
+      \globalNoKey
       \property Staff.instrument = "2 Trp. in B\\textflat  "
       \property Staff.instr = "Trp."
       \type Voice = trpI { \stemup \trpI }
@@ -75,7 +75,7 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
     >
   >
   \type StaffGroup = strings <
-    \type GrandStaff = violins <
+%    \type GrandStaff = violins <
       \type Staff = viI <
         \property Staff.instrument = "Violin I"
         \property Staff.instr = "Vi. I"
@@ -88,7 +88,7 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
         \global
         \viII
       >
-    >
+%    >
     \type Staff = vla <
       \property Staff.instrument = "Viola"
       \property Staff.instr = "Vla."
@@ -110,7 +110,7 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
   >
 >
  \paper {
-    \paper_sixteen
+%    \paper_sixteen;
     linewidth = 185.\mm;
     textheight = 260.\mm;
     \translator {
@@ -119,11 +119,16 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
     }
     \translator { \StaffContext
 	\consists "Staff_margin_engraver";
-        marginHangOnClef = 1;
-        marginScriptPadding = "20.0";
+%        marginHangOnClef = 1;
+        marginScriptPadding = "52.0";
 	textstyle = "italic";
 	textScriptPadding = 5.0;
+        textEmptyDimension = 1;
+        oldTieBehavior = 1;
     }
+%\translator{\VoiceContext
+%\remove Auto_beam_engraver; % Bug workaround!
+%}
   }
 }
 
diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly
index afc4eb1a37..251d0cbdf2 100644
--- a/mutopia/N.W.Gade/strings.ly
+++ b/mutopia/N.W.Gade/strings.ly
@@ -57,7 +57,7 @@ r4 r^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4;
 [ es f es ) d ][c8-. d'16 ( e ] |
 [f! \sfz g f e][d \> e d c ] |
 [ b c b \! a][g a g ) fis ] |
-f4 ( \p \< g |
+f!4 ( \p \< g |
 \! a2 |
 a4 \> [g8 \! f'] |
 [e c a ) g ] |
@@ -66,7 +66,7 @@ f4 ( \< g |
 a4 \> ) g |
 \! a2 ( |
 [a8_"dim." g f d] |
-<{[b g ][a ) g ] |} % grace note b8 b
+<{[b g ][a ) g ] |} 
   \type Voice=x {s8.. \tiny b8}>
 R2 |
 r4 r8 a'-. \mf |
@@ -77,17 +77,17 @@ r4 r8 a-. \mf |
 [a-. \< a-. a-. \! a-. ] |
 b4. \f bes8 ( |
 ) bes'4.-> bes,8 ( |
-) bes'4.-> a8 |
+) bes'4.-> a8 \p | % added \p
 [g-. \< f-. e-. \! d-. ] |
 [cis16 ( e d b][ ) g8 \f bes8 (] |
 ) bes'4.-> bes,8 ( |
 ) bes'4.-> a8 \p |
 [g-. \< f-. e-. \! d-. ] |
 [g, g'16 \f ( a ][ ) g8 g,, \p ] |
-g4 ( a | % added longer slur
-b \tiny [a16*1/2 b*1/2] \normalsize[c8*1/2 ) g ] | % grace notes [a16 ( b][) c
-g4 ( a |
-b \tiny [a16*1/2 b*1/2] \normalsize [) c8*1/2 bes' \f ( ] | % grace notes [a16 ( b][) c
+g4^\trill ( a^\trill | % added longer slur and trills
+b^\trill \tiny [a16*1/2 b*1/2] \normalsize[c8*1/2 ) g ] |
+g4^\trill ( a^\trill |
+b^\trill \tiny [a16*1/2 b*1/2] \normalsize [) c8*1/2 bes' \f ( ] | 
 ) bes'4.-> a8 |
 [f-. e-. d-. f, ( ] |
 < ) d'4. \sfz a'> g,8 ( |
@@ -112,9 +112,9 @@ a ( \< ) e' |
 e-. () \! e-. |
 e \sfz \> [ d8 \! c ] |
 b2 \p | % \p added
-\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | 
 \! e ) b |
-\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | 
 \! e ) b |
 \tiny d8*1/2 \normalsize f2 \sfz ( *7/8 |
 b,4 [c8 ) b] |
@@ -124,15 +124,15 @@ a ( ) e' |
 e-.  \< () \! e-. |
 e ( \sfz \> [ d8 \! c ] |
 ) b2 \p |
-\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis |
 \! e ) b |
-\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis |
 \! e ) b |
 \tiny d8*1/2 \normalsize f2 \sfz ( *7/8 |
 b,4 [c8 ) b] |
 a2 \p ~ |
 gis |
-\tiny a8*1/2 \normalsize d2 ( \> *7/8 | % grace note a8 () d2
+\tiny a8*1/2 \normalsize d2 ( \> *7/8 |
 b4 [ c8 \! b ] |
 a2 \p |
 ) gis |
@@ -172,7 +172,7 @@ bes4 ( \< c |
 d4 \> c |
 \! d2 |
 [d8 c][bes g] |
-[e c] \tiny e8*1/4 \normalsize [d *3/4 ) c ] | % grace note e8() d
+[e c] \tiny e8*1/4 \normalsize [d *3/4 ) c ] |
 R2 |
 r4 r8 d' \mf |
 d2:8 \< |
@@ -190,9 +190,9 @@ d2:8 \< |
 [c-. \< bes-. a-. \! g-. ] |
 [c, c'16 ( \f d] [) c8 c,, \p ] |
 c4^\trill ( d^\trill |
-e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) c ] | % grace notes [d16 ( e] )f
+e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) c ] |
 c4^\trill ( d^\trill |
-e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) es' \f ( ] | % grace notes [d16 ( e] )f % \f added 
+e^\trill \tiny [d16*1/2 e*1/2] \normalsize [f8 *1/2 ) es' \f ( ] |
 ) es'4. d8 |
 [bes-. a-. g-. bes, ( ] |
 ) d'4. \sfz c,8 ( |
@@ -215,7 +215,7 @@ f4 g |
 f ) e |
 es2 ~ |
 d4 r |
-\tiny f'8*1/2 \normalsize a4 \sfz ( *3/4 e | % grace note f8() a
+\tiny f'8*1/2 \normalsize a4 \sfz ( *3/4 e |
 f b, |
 ) c r |
 R2 |
@@ -351,7 +351,7 @@ f4. \f e8 ( |
 [cis-. \< d-. e-. \! f-. ] |
 [f \f g16 ( a][ ) g8 g, \p ] |
 g4^\trill ( \< \! a^\trill |
-b^\trill \> \tiny [a16*1/2 b*1/2] \normalsize [ ) c8 *1/2 \! g] | % grace notes [a16 b] [c8
+b^\trill \> \tiny [a16*1/2 b*1/2] \normalsize [ ) c8 *1/2 \! g] |
 g4^\trill ( \< \! a^\trill |
 b^\trill \> \tiny [a16*1/2 b*1/2] \normalsize [ ) \! c8 *1/2 g' \f ( ] |
 < ) g4.-> bes> a8 |
@@ -392,7 +392,7 @@ b4:16 \p \< \! c4:16 \> |
 \! b2:16 |
 b4:16 \p \< \! c4:16 \> |
 \! b2:16 |
-\tiny d8*1/2 \normalsize f2 ( \> *7/8 | % grace note c8 f2 % corrected to d8
+\tiny d8*1/2 \normalsize f2 ( \> *7/8 | % grace note c8 corrected to d8
 \! ) e |
 b-> ( |
 ) e4 r |
@@ -404,7 +404,7 @@ b4:16 \p \< \! c4:16 \> |
 \! b2:16 |
 b4:16 \p \< \! c4:16 \> |
 \! b2:16 |
-\tiny d8*1/2 \normalsize f2 ( \sfz *7/8 | % grace note d8 f2 
+\tiny d8*1/2 \normalsize f2 ( \sfz *7/8 |
 ) e |
 [ a,16 ( \p d a d ][a d a d] |
 [ b16 d b d ][b d b ) d] |
@@ -477,9 +477,9 @@ bes4. a8 ( \f |
 [fis-. \< g-. a-. \! bes-.] |
 [bes \f c16 ( d][)c8 c, \p ] |
 c4^\trill ( d^\trill |
-e^\trill \tiny [d16*1/2 e*1/2] \normalsize [ f8 *1/2 ) c ] | % grace notes [d16 ( e] )f
+e^\trill \tiny [d16*1/2 e*1/2] \normalsize [ f8 *1/2 ) c ] |
 c4^\trill ( d^\trill |
-e^\trill \tiny [d16*1/2 e*1/2] \normalsize [ ) f8 *1/2 a ( \f ] | % grace notes [d16 ( e] )f
+e^\trill \tiny [d16*1/2 e*1/2] \normalsize [ ) f8 *1/2 a ( \f ] |
 <a4. ) c4.> d8 |
 [d d d bes \f (] |
 <bes4. ) g'4.> bes8 (|
@@ -764,7 +764,7 @@ r r8 <f \p c'> |
   f'4. }
  {e4. c8 ( |
   ) c'4. c,8 ( |
-  ) c'4. }> d'8 |
+  ) c'4. }> d'8 \p | % \p added
 [c-. \< bes-. a-. \! g-. ] |
 <e4 c> r8 <f, \p c'> |
 <f2:8 c'2:8> |
@@ -912,8 +912,8 @@ r4 r8 c''8 \f (|
 ) c,4. c8 ( |
 ) c,4. c''8 ( |
 < ) g4. c,_> > c8 ( |
-< ) g4. c,> c,8 |
-[cis-. \p \< d-. e-. \! f-. ] |
+< ) g4. c,> c,8 \p |
+[cis-. \< d-. e-. \! f-. ] |
 g,4.  c8 \f ( |
 < ) c4. f,_> > c8 ( | % slur added
 < ) c4. f,> c8-> | 
@@ -1029,7 +1029,7 @@ r4 r8 f'' (|
 [fis-. \< g-. a-. \! bes-. ] |
 c,4.  f8 \f ( |
 <) f4. bes,_> > f8 (|
-<) f4. bes,> f8 |
+<) f4. bes,> f8 \p | % \p added
 [fis-. \< g-. a-. \! bes-. ] |
 c,4 r8 <{ f8 \p |
  f2:8 \< |
@@ -1166,8 +1166,8 @@ R2*2 |
 c'4_"pizz." r |
 c, r8 c'8_"arco?" ( |
 ) c,4.-> c'8 ( |
-) c,4. f8-. |
-[f-. \p \< f-. f-. \! f-.] |
+) c,4. f8-. \p |
+[f-. \< f-. f-. \! f-.] |
 g4. c,8 ( |
 ) f,4.-> c'8 ( |
 ) f,4.-> f'8 |
@@ -1262,8 +1262,8 @@ f4. bes,8 \p |
 bes2:8 \< |
 \! c4. f8 \f ( |
 ) bes,4.-> <f'8 \p bes ( > |
-) bes,4. bes'8 |
-c2: \< |
+) bes,4. bes'8 \p | % \p added
+c2:8 \< |
 \! c4 r8 f, \p |
 f2:8 \< |
 f2:8 |
diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly
index d7afe817ad..f2849a54b8 100644
--- a/mutopia/N.W.Gade/wood.ly
+++ b/mutopia/N.W.Gade/wood.ly
@@ -88,15 +88,15 @@ a4 ( \p \< ) e' |
 e-. () \! e-. |
 e ( \> [ d8 \! c ] |
 ) b2 \p |
-\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis |
 \! e ) b |
-\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis | % grace note e8() g4
+\tiny e8*1/2 \normalsize g4 ( \> *3/4 dis |
 \! e_"dim." ) b |
 \tiny d!8 \sfz *1/2 \normalsize f2 ( \> *7/8 |
 b,4 [ \! c8 b] |
 a2 \p |
 ) gis |
-\tiny a8*1/2 \normalsize d2( \> *7/8 | % grace note a8 () d2
+\tiny a8*1/2 \normalsize d2( \> *7/8 |
 \! b4 [ c8 b ] |
 a2 \p |
 ) gis |
@@ -157,7 +157,7 @@ r4 r8 bes, ( |
 ) a8 r g4 ( |
 ) f8 r r4 |
 R2*7 |
-\tiny f8 \f *1/2 \normalsize a4 \> ( *3/4 e | % grace note f8 a4
+\tiny f8 \f *1/2 \normalsize a4 \> ( *3/4 e |
 f \! b, |
 ) c r |
 R2*7 |
@@ -390,7 +390,7 @@ a4 \p ( [g8. a16 ] g4 |
 fis ) g8 r r4 |
 a4 ( [g8. a16 ] g4 |
 fis ) g8 r [d^""^"solo" \mf \< () \! b' ] |
-\tiny a8*1/2 \normalsize d2 ( \> *7/8 [b8. \! g16] | % grace note a8 d2 
+\tiny a8*1/2 \normalsize d2 ( \> *7/8 [b8. \! g16] |
 ) d2 r4 |
 R2. |
 r4 r \times 2/3 { [b'8^""^"solo" ( \ff d, ) d' ] } |
@@ -428,7 +428,7 @@ b2 ~ |
 b4 a |
 b2 ~ |
 [b8_"dim." a g ) e ] |
-<{[cis ( a  ) b a-. ] | } % grace note cis\8 b 
+<{[cis ( a  ) b a-. ] | } 
   \type Voice = x {s8.. \tiny cis8 } >
 [fis''-. f-. f-. e-. ] |
 [e-. \< dis-. dis-. \! d-. ] |
@@ -626,7 +626,7 @@ a4 \p ( [g8. a16 ] g4 |
 fis ) g8 r r4 |
 a4 ( [g8. a16 ] g4 |
 fis ) g8 r [d^""^"solo" \mf \< () \! b' ] |
-\tiny a8*1/2 \normalsize d2 ( \> *7/8 [b8. \! g16] | % grace note a8 d2 
+\tiny a8*1/2 \normalsize d2 ( \> *7/8 [b8. \! g16] |
 ) d2 r4 |
 R2. |
 r4 r \times 2/3 { [b'8 ( \f d, ) d' ] } |
@@ -903,7 +903,7 @@ e2 \p \< ~ |
 \! e \> ~ |
 \! e \< ~ |
 \! e \> |
-\tiny \! d'8 \sfz *1/2 ~ \normalsize f2 \> *7/8 ~ | % grace note d8 f
+\tiny \! d'8 \sfz *1/2 ~ \normalsize f2 \> *7/8 ~ |
 \! e4. r8 |
 f,2 \> ( ~ |
 [ \! e8 d c ) b ] | 
@@ -915,7 +915,7 @@ e2 \p ~
 e ~ |
 e ~ |
 e |
-\tiny d'8 \sfz *1/2 ~ \normalsize f2 \> *7/8 ~ | % grace note d8 f
+\tiny d'8 \sfz *1/2 ~ \normalsize f2 \> *7/8 ~ |
 \! e4. r8 |
 f,2 \p ~ |
 e4 r |