X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftypography-demo.ly;h=836088123b03568e301c537489e0fb4e32a76388;hb=24dd6365d3d05f13b9259f547be9b2517851a5d1;hp=a28757a87137617c8b3d1bc40918985d8f37e39c;hpb=1502c1246153557cffdb98ae923f250935076262;p=lilypond.git

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index a28757a871..836088123b 100644
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.13.36"
+\version "2.19.21"
 
 ignoreMelisma =	\set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -19,9 +19,17 @@ 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 
+
+  % 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 = {
@@ -34,8 +42,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
   <<
@@ -43,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
 }
 
 
@@ -75,14 +84,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 +107,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 +131,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 +155,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
     }