Merge branch 'master' into dev/texi2html

[lilypond.git] / input / typography-demo.ly

diff --git a/input/typography-demo.ly b/input/typography-demo.ly
index 2d4631419faaa8268b685ceaae23c3b9496424dd..0c1488f46a7e87f64f8610931df1618978a97287 100644 (file)
--- a/input/typography-demo.ly
+++ b/input/typography-demo.ly
@@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.9.16"
+\version "2.11.51"
 
 ignoreMelisma =        \set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -90,7 +90,7 @@ pianoRH =  \relative c''' \repeat volta 2\new Voice {
 
   r8 <e c g>8[  <e c g>] |
   <d c a>4. r8 \clef bass  <d b f> <d b f> |
-               \setTextCresc
+               \crescTextCresc
                e,16_" "\<
                g c g e g d gis b gis d gis |
                c, e a e c e a,-\f\! d fis d a d |
@@ -157,10 +157,6 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
          \override Stem #'stemlet-length = #0.5
          \override Slur #'height-limit = #1.5
        }
-       \context {
-         \PianoStaff
-         \override VerticalAlignment #'forced-distance = #10
-       }
       }
       
   \midi {