Imported Upstream version 2.19.45

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

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index 92bab856430f9b76f6032893e8b5d198346e4594..836088123b03568e301c537489e0fb4e32a76388 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.17.6"
-#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
+\version "2.19.21"
 
 ignoreMelisma =        \set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -20,8 +19,17 @@ ignoreMelismaOff = \unset ignoreMelismata
                                %#(set-global-staff-size (* 5.8 mm))
   indent = #(* mm 4)
   line-width = #(* mm 140)
-  system-system-spacing #'basic-distance = #10.3
+  system-system-spacing.basic-distance = #10.3
   ragged-bottom = ##t 
+
+  % Font settings for Cyrillic and Hebrew
+  % Linux Libertine fonts contain Cyrillic and Hebrew glyphs.
+  #(define fonts
+    (set-global-fonts
+     #:roman "Linux Libertine O,serif"
+     #:sans "Linux Biolinum O,sans-serif"
+     #:typewriter "Linux Libertine Mono O,monospace"
+   ))
 }
 
 modernAccidentals = {
@@ -44,10 +52,10 @@ melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
     { \stemDown f8.[ g16] } >> \stemNeutral a8 |
   fis4  g8 c16[ b a g] f[ e] |
   d4 f8
-  \transpose a' e' \relative c'' { a16[ g fis! g] f![ d]  } |
+  \transpose a' e' \relative { a'16[ g fis! g] f![ d]  } |
   g4. r8 gis gis |
   a4 a16.[ b32] c8[( a]) fis8 |
-  g4.~ g8-\fermata
+  g4.~ 8-\fermata
 }
 
 
@@ -127,8 +135,8 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
         } <<
           \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