* input/mutopia/F.Schubert/standchen.ly (trebleThrough): fixes

* lily/simultaneous-music.cc (to_relative_octave): add Event_chord.

* VERSION (MY_PATCH_LEVEL): open HEAD/1.9 branch.

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 1d510340ec55d3a4deb56981995edb41c1d37316..29d2d36a908a20b7d78f7e48adcbad8a2829cb74 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -152,7 +152,7 @@ trebleVerseOne =  \notes\relative c{
        r8 <<f g b>> <<g b d>> <<f g b>> <<g b d>> <<f g b>> |
        r8 <<es g c>> <<g c es>> <<es g c>> <<g c es>> <<es g c>> |
        <<g'' b,>>4.-( <<f d>>8-)
-       \times 2/3 { <<f d>>-(-[ <<es c>>-]-) <<d b>> }
+       \times 2/3 { <<f d>>-(-[ <<es c>> <<d b>>-)-] }
 
        %10
        <<c es>>2. |
@@ -165,7 +165,7 @@ trebleVerseOne =  \notes\relative c{
        <<es g bes>>
        <<g bes es>>-]
        <<es' c'>>-(
-       <<d bes>>4.-(-)
+       <<d bes'>>4.-(-)
        <<f as>>8-)
        
        \times 2/3 { <<f as>>-(-[ <<es g>> <<d f>>-)-] }
@@ -185,7 +185,7 @@ trebleVerseOne =  \notes\relative c{
        r8 <<e g>> <<g c>> <<e g>> <<g c>> <<e g>> |
        r8 <<f a c>> <<a c f>> <<f a c>> <<a c f>> <<f a c>> |
        r8 <<e g c>> <<g c e>> <<e g c>> <<g c e>> <<e g c>> |
-       \times 2/3  { <<f f'>>-\f-( <<e e'>> <<f f'>> }
+       \times 2/3  { <<f' f'>>-\f-( <<e e'>> <<f f'>> }
        <<a a'>>4.-> <<f f'>>8-)  |
 }
 
@@ -250,7 +250,7 @@ trebleThrough =  \notes \relative c'{
        %80
 
        \property Voice . TextScript \override #'font-shape = #'italic
-       <<e g>>_"dim."
+       <<e g>>2._"dim."
        \property Voice . TextScript \revert #'font-shape
 
        <<g, e' g>>2. |

diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc
index aa7ecd40f9669851127d78c78eee3566c9021ee8..77c3d89d0670a2a1bd575b61a9f6d04872ffb524 100644 (file)
--- a/lily/simultaneous-music.cc
+++ b/lily/simultaneous-music.cc
@@ -43,7 +43,7 @@ Simultaneous_music::to_relative_octave (Pitch p)
 
   if (count && first != last)
     {
-      String str = _("Changing relative definition causes pitch change.");
+      String str = _("Changing relative definition may cause octave change.");
       str += "\nWas: " +  first.to_string ()
        + " -- now returning: " + last.to_string () + "\n";