Imported Upstream version 2.18.0

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

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index 1e8a1acb93f81326544c796413c82a6caaa01e35..92bab856430f9b76f6032893e8b5d198346e4594 100644 (file)
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -8,8 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.16.0"
-#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
+\version "2.17.6"
 #(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
 
 ignoreMelisma =        \set ignoreMelismata = ##t
@@ -35,7 +34,7 @@ modernAccidentals = {
 melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
   \time 6/8
   \autoBeamOff
-  << s2.^\markup {  \larger { \hspace #-3.0 Lieblich, etwas geschwind } }
+  << s2.^\markup {  \larger \line { \hspace #-3.1 Lieblich, etwas geschwind } }
      R2.
   >>
   r4 r8 c4 g8 |
@@ -77,14 +76,14 @@ secondVerse = \lyricmode {
 }
 
 pianoRH =  \relative c''' \repeat volta 2\new Voice {
-  \accidentalStyle "modern"
+  \accidentalStyle modern
   \voiceOne
   g16( fis a g fis g f e d c b
   \oneVoice
   a ) | 
   <g e>8( <es fis a> <d e bes'> <c e c'>\arpeggio) r8 r | 
   r8 c'( e,) f r a |
-  \once \override DynamicLineSpanner   #'padding =#3
+  \once \override DynamicLineSpanner.padding =#3
   r8
   << { fis( g) } \\
      << { a4 } { s8\> s8\! } >>
@@ -100,7 +99,7 @@ pianoRH =  \relative c''' \repeat volta 2\new Voice {
              }
 
 pianoLH =  \relative c'' \repeat volta 2\new Voice {
-    \accidentalStyle "modern"
+    \accidentalStyle modern
     \voiceTwo
     g16( fis a g fis g
 
@@ -124,9 +123,9 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
       << \time 6/8
         \new Staff \with {
           fontSize = #-3
-          \override StaffSymbol #'staff-space = #(magstep -3)
+          \override StaffSymbol.staff-space = #(magstep -3)
         } <<
-          \context Staff \accidentalStyle "modern"
+          \context Staff \accidentalStyle modern
           \melody >>
         \lyricsto "singer" \new Lyrics \firstVerse
         \lyricsto "singer" \new Lyrics \secondVerse
@@ -148,15 +147,15 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
       \layout {
        \context {
          \Lyrics
-         \override LyricText #'font-size = #-1
+         \override LyricText.font-size = #-1
        }
        \context {
          \Score
-         \override Beam #'beam-thickness = #0.55
-         \override Beam #'auto-knee-gap = #4.0
-         \override SpacingSpanner #'spacing-increment = #1.0
-         \override Stem #'stemlet-length = #0.5
-         \override Slur #'height-limit = #1.5
+         \override Beam.beam-thickness = #0.55
+         \override Beam.auto-knee-gap = #4.0
+         \override SpacingSpanner.spacing-increment = #1.0
+         \override Stem.stemlet-length = #0.5
+         \override Slur.height-limit = #1.5
        }
       }