Merge remote-tracking branch 'origin/translation'

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

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index a28757a87137617c8b3d1bc40918985d8f37e39c..45a9945dfd7f67e4f613014121f0cab9b9a05932 100644 (file)
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -8,7 +8,8 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.13.36"
+\version "2.19.2"
+#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
 
 ignoreMelisma =        \set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -19,8 +20,7 @@ ignoreMelismaOff = \unset ignoreMelismata
                                %#(set-global-staff-size (* 5.8 mm))
   indent = #(* mm 4)
   line-width = #(* mm 140)
-  interscoreline = 2.\mm
-  between-system-space = 15\mm
+  system-system-spacing #'basic-distance = #10.3
   ragged-bottom = ##t 
 }
 
@@ -34,8 +34,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 \line { \hspace #-3.1 Lieblich, etwas geschwind } }
+     R2.
+  >>
   r4 r8 c4 g8 |
   \acciaccatura { f16 }  e4 c8
   <<
@@ -46,7 +47,7 @@ melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
   \transpose a' e' \relative c'' { a16[ g fis! g] f![ d]  } |
   g4. r8 gis gis |
   a4 a16.[ b32] c8[( a]) fis8 |
-  g4.~ g8-\fermata
+  g4.~ 8-\fermata
 }
 
 
@@ -75,14 +76,14 @@ 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
   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\! } >>
@@ -98,7 +99,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
 
@@ -122,12 +123,12 @@ 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 #(set-accidental-style 'modern)
+          \context Staff \accidentalStyle modern
           \melody >>
-        \lyricsto "singer" \new Lyrics \firstVerse
-        \lyricsto "singer" \new Lyrics \secondVerse
+        \new Lyrics \lyricsto "singer" \firstVerse
+        \new Lyrics \lyricsto "singer" \secondVerse
         \new PianoStaff << 
           \set PianoStaff.instrumentName = \markup {
             \bold
@@ -146,24 +147,20 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
       \layout {
        \context {
          \Lyrics
-         \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.85 . 2.2)
-         \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
        }
       }
       
   \midi {
-    \context {
-      \Score
-      tempoWholesPerMinute = #(ly:make-moment 70 4)
-      }
+    \tempo 4 = 70
     }