Imported Upstream version 2.16.0

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

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index e97ec8b8f785089d2dd8d67d11e9da28b7d53591..1e8a1acb93f81326544c796413c82a6caaa01e35 100644 (file)
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -8,7 +8,9 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.14.0"
+\version "2.16.0"
+#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
+#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
 
 ignoreMelisma =        \set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -33,8 +35,9 @@ modernAccidentals = {
 melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
   \time 6/8
   \autoBeamOff
-  s1*0^\markup {  \larger { \hspace #-3.0 Lieblich, etwas geschwind } }
-  R2.
+  << s2.^\markup {  \larger { \hspace #-3.0 Lieblich, etwas geschwind } }
+     R2.
+  >>
   r4 r8 c4 g8 |
   \acciaccatura { f16 }  e4 c8
   <<
@@ -74,7 +77,7 @@ secondVerse = \lyricmode {
 }
 
 pianoRH =  \relative c''' \repeat volta 2\new Voice {
-  #(set-accidental-style 'modern)
+  \accidentalStyle "modern"
   \voiceOne
   g16( fis a g fis g f e d c b
   \oneVoice
@@ -97,7 +100,7 @@ pianoRH =  \relative c''' \repeat volta 2\new Voice {
              }
 
 pianoLH =  \relative c'' \repeat volta 2\new Voice {
-    #(set-accidental-style 'modern)
+    \accidentalStyle "modern"
     \voiceTwo
     g16( fis a g fis g
 
@@ -123,7 +126,7 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
           fontSize = #-3
           \override StaffSymbol #'staff-space = #(magstep -3)
         } <<
-          \context Staff #(set-accidental-style 'modern)
+          \context Staff \accidentalStyle "modern"
           \melody >>
         \lyricsto "singer" \new Lyrics \firstVerse
         \lyricsto "singer" \new Lyrics \secondVerse
@@ -158,10 +161,7 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
       }
       
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 70 4)
-      }
+    \tempo 4 = 70
     }