X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftypography-demo.ly;h=0c1488f46a7e87f64f8610931df1618978a97287;hb=def21b306e2b8fa2d5630fab0878e9922e197f0c;hp=83d4c11acfd780444de2f852b60ad79fc382a27f;hpb=34eb783cd6b1af2fd7cf2c573ec9dc7e9d16e7f7;p=lilypond.git

diff --git a/input/typography-demo.ly b/input/typography-demo.ly
index 83d4c11acf..0c1488f46a 100644
--- a/input/typography-demo.ly
+++ b/input/typography-demo.ly
@@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.6.0"
+\version "2.11.51"
 
 ignoreMelisma =	\set ignoreMelismata = ##t
 ignoreMelismaOff = \unset ignoreMelismata 
@@ -18,10 +18,10 @@ ignoreMelismaOff = \unset ignoreMelismata
 \paper  {
 				%#(set-global-staff-size (* 5.8 mm))
   indent = #(* mm 4)
-  linewidth = #(* mm 140)
+  line-width = #(* mm 140)
   interscoreline = 2.\mm
-  betweensystemspace = 15\mm
-  raggedbottom = ##t 
+  between-system-space = 15\mm
+  ragged-bottom = ##t 
 }
 
 modernAccidentals = {
@@ -37,7 +37,7 @@ melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
   s1*0^\markup {  \bigger { \hspace #-3.0 Lieblich, etwas geschwind } }
   R2.
   r4 r8 c4 g8 |
-  \acciaccatura { f16( }  e4) c8
+  \acciaccatura { f16 }  e4 c8
   <<
     \new Voice { \stemUp f8. g16 }
     { \stemDown f8.[ g16] } >> \stemNeutral a8 |
@@ -90,7 +90,7 @@ pianoRH =  \relative c''' \repeat volta 2\new Voice {
 
   r8 <e c g>8[  <e c g>] |
   <d c a>4. r8 \clef bass  <d b f> <d b f> |
-		\setTextCresc
+		\crescTextCresc
 		e,16_" "\<
 		g c g e g d gis b gis d gis |
 		c, e a e c e a,-\f\! d fis d a d |
@@ -117,51 +117,56 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
     g,8 r r g16 r16\fermata 
     }
 
-\book {
+  \book {
     \score {
-	<< \time 6/8
-	   \new Staff \with {
-	     fontSize = #-3
-	     \override StaffSymbol #'staff-space = #(magstep -3)
-	   } <<
-	       \context Staff #(set-accidental-style 'modern)
-	       \melody >>
-	   \lyricsto "singer" \new Lyrics \firstVerse
-	   \lyricsto "singer" \new Lyrics \secondVerse
-	   \new PianoStaff << 
-	       \set PianoStaff.instrument = \markup {
-		   \bold
-		   \bigger\bigger\bigger\bigger \huge "2." \hspace #1.0 }
-	       \context Staff = up <<
-		 \pianoRH
-		 \pianoLH
-		 >>
-	       \context Staff = down { \clef bass \skip 1*2 }
-	   >> 
+      << \time 6/8
+	 \new Staff \with {
+	   fontSize = #-3
+	   \override StaffSymbol #'staff-space = #(magstep -3)
+	 } <<
+	   \context Staff #(set-accidental-style 'modern)
+	   \melody >>
+	 \lyricsto "singer" \new Lyrics \firstVerse
+	 \lyricsto "singer" \new Lyrics \secondVerse
+	 \new PianoStaff << 
+	   \set PianoStaff.instrumentName = \markup {
+	     \bold
+	     \bigger\bigger\bigger\bigger
+	     \huge
+	     "2."
+	   }
+	   \context Staff = up <<
+	     \pianoRH
+	     \pianoLH
+	   >>
+	   \context Staff = down { \clef bass \skip 1*2 }
+	 >> 
        >>
 
-	\layout {
-	    \context {
-		\Lyrics
-		minimumVerticalExtent = #'(-0.85 . 2.2)
-		\override LyricText #'font-size = #-1
-	    }
-	    \context {
-		\Score
-		\override 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
-	    }
-	    \context {
-		\PianoStaff
-		\override VerticalAlignment #'forced-distance = #10
-	    }
+      \layout {
+	\context {
+	  \Lyrics
+	  \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.85 . 2.2)
+	  \override LyricText #'font-size = #-1
 	}
-	\midi {
-	    \tempo 4 = 70
+	\context {
+	  \Score
+	  \override 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)
+      }
     }
-}
+
+
+    }
+  }