X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftypography-demo.ly;h=836088123b03568e301c537489e0fb4e32a76388;hb=a307b1d69dff09d4d9a75c53a20a02ec7545d282;hp=a28429b9dbe4e0a1626b8dcaaaaf93431f03e182;hpb=01df8ad908c92687d0c352e5ad5f067e52809423;p=lilypond.git

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index a28429b9db..836088123b 100644
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -8,9 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.17.6"
-#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
-#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
+\version "2.19.21"
 
 ignoreMelisma =	\set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -21,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 = {
@@ -35,7 +42,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 |
@@ -45,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
 }
 
 
@@ -128,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