Merge branch 'master' into nested-bookparts

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

diff --git a/input/typography-demo.ly b/input/typography-demo.ly
index 8dfc39302c242a6293da21c050a30454963c0082..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.7.39"
+\version "2.11.51"
 
 ignoreMelisma =        \set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -37,7 +37,7 @@ melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
   s1*0^\markup {  \bigger { \hspace #-3.0 Lieblich, etwas geschwind } }
   R2.
   r4 r8 c4 g8 |
-  \acciaccatura { f16( }  e4) c8
+  \acciaccatura { f16 }  e4 c8
   <<
     \new Voice { \stemUp f8. g16 }
     { \stemDown f8.[ g16] } >> \stemNeutral a8 |
@@ -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 |
@@ -129,7 +129,7 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
         \lyricsto "singer" \new Lyrics \firstVerse
         \lyricsto "singer" \new Lyrics \secondVerse
         \new PianoStaff << 
-          \set PianoStaff.instrument = \markup {
+          \set PianoStaff.instrumentName = \markup {
             \bold
             \bigger\bigger\bigger\bigger
             \huge
@@ -157,14 +157,16 @@ 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 {
-       \tempo 4 = 70
+      
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 70 4)
       }
     }
+
+
+    }
   }