(output-framework): put scaling in

[lilypond.git] / input / wilhelmus.ly

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index deee4d79d1d7b84c8e194ef289f64bdf0585a6f0..23b4892cd252a34f64537e4f16d812f9ca771a95 100644 (file)
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.3.0"
+\version "2.5.2"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -14,16 +14,19 @@
 #(define (prepend-grob-property grob-name
          grob-prop entry)
   (lambda (context)
-   (ly:context-pushpop-property context grob-name grob-prop
-    (cons
-     entry
-     (assoc-get grob-prop (car (ly:context-property context grob-name)))))))
+   (let*
+    ((grob-def (ly:context-property context grob-name)))
+    (if (pair? grob-def)
+     (ly:context-pushpop-property context grob-name grob-prop
+      (cons
+       entry
+       (assoc-get grob-prop (car grob-def))))))))
 
 #(define (set-extra-space grob-name entry value)
   (prepend-grob-property grob-name 'space-alist
    (cons entry (cons 'extra-space value))))
 
-noclefs = \notes {
+noclefs =  {
   s1
   \override Staff.Clef #'break-visibility = #(lambda (dir) (cons #t #t))
 }
@@ -52,13 +55,13 @@ pipeSymbol = {
 
 myBreak = { \bar "" \break }
 
-\paper {
+\layout {
   indent = 0.0\mm
   linewidth = 120.0\mm
   textheight = 270.0\mm
 }
 
-voice = \notes \relative c' {
+voice =  \relative c' {
   \clef violin
   \key g \major
   d4 | g g a a b | a8 \myBreak
@@ -78,7 +81,7 @@ voice = \notes \relative c' {
   d,4 | g4.\melisma a8\melismaEnd b2 a2 g4 | fis e8 \myBreak
   d8 | e4 g g fis | 
   
-  \override NoteHead #'style = #'neo_mensural
+  \override NoteHead #'style = #'neomensural
 
   g\breve
 
@@ -89,7 +92,7 @@ voice = \notes \relative c' {
   \bar "|."
 }
 
-stich = \notes \relative c'' {
+stich =  \relative c'' {
   \override Staff.NoteCollision #'merge-differently-dotted = ##t
   \set fontSize = #-3
   %% broken?
@@ -110,7 +113,7 @@ stich = \notes \relative c'' {
   s8 e8[ fis]
 }
 
-modernText = \lyrics {
+modernText = \lyricmode {
   Wil -- hel -- mus van Nas -- sou -- we
   ben ik van duit -- sen bloed,
 
@@ -124,7 +127,7 @@ modernText = \lyrics {
   heb ik al -- tijd ge -- eerd.
 }
 
-text = \lyrics {
+text = \lyricmode {
   Wil -- hel -- mus van Nas -- sou -- we
   Ben ick van duyt -- schen bloet,
   Den Va -- der -- landt ghe -- trou -- we,
@@ -139,14 +142,14 @@ text = \lyrics {
 
 oneHalfNoteTime = \markup {
   \override #'(baseline-skip . 0)
-  \column < { \number "1" } { \smaller \smaller \note #"2" #-0.5 } >
+  \column { \line { \number "1" } \line { \smaller \smaller \note #"2" #-0.5 } }
 }
 
-\paper {
+\layout {
   raggedright = ##t
 
   \context {
-    \ScoreContext
+    \Score
     %% defaults
     %% (shortest-duration-space . 2.0)
     %% (spacing-increment . 1.2)
@@ -170,7 +173,7 @@ oneHalfNoteTime = \markup {
       \set Staff.minimumVerticalExtent = #'(2 . 2)
       
       %% Custom time signature
-      \override Staff.TimeSignature #'print-function = #Text_item::print
+      \override Staff.TimeSignature #'print-function = #Text_interface::print
       \override Staff.TimeSignature #'text = #oneHalfNoteTime
       \noclefs
     
@@ -182,8 +185,8 @@ oneHalfNoteTime = \markup {
       \text
     }
   >>
-  \paper {}
-%  \midi {}
+  \layout {}
+  \midi {}
 }
 
 %%% Local variables: