X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fwilhelmus.ly;h=73806699fe0c0bd5d29bf6f29a2a6721a23df411;hb=f4beff9cdba290efe94de240e38a5f2ec19c8388;hp=cb43459464e934049ea0da4ad4c97e59a9d027d5;hpb=677031b7d5fd1806ca5d72bb6cbc37b3aacd5071;p=lilypond.git

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index cb43459464..73806699fe 100644
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.3.2"
+\version "2.7.14"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -14,37 +14,41 @@
 #(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))
+  \override Staff.Clef #'break-visibility =
+    #all-invisible
 }
 
 setMargins = {
   %% first line left margin
   %% justified:
-  %% \context Staff \applycontext #(set-extra-space 'TimeSignature 'first-note 4.5)
+  %% \context Staff \applyContext #(set-extra-space 'TimeSignature 'first-note 4.5)
   %% raggedright:
-  \context Staff \applycontext #(set-extra-space 'TimeSignature 'first-note 9.5)
+  \context Staff \applyContext #(set-extra-space 'TimeSignature 'first-note 9.5)
   
   %% next lines left margin
-  \context Staff \applycontext #(set-extra-space 'KeySignature 'staff-bar 15)
+  \context Staff \applyContext #(set-extra-space 'KeySignature 'staff-bar 15)
   
   %% next lines small key-signature margin
-  \context Staff \applycontext #(set-extra-space 'LeftEdge 'key-signature 1.0)
+  \context Staff \applyContext #(set-extra-space 'LeftEdge 'key-signature 1.0)
 }
 
 pipeSymbol = {
   %% Set height of bar line to 2 staff-spaces
-  \once \override Staff.BarLine #'bar-size-procedure = #(lambda (x) 2)
+  \once \override Staff.BarLine #'bar-size = #2
   %% Move barline one staff-space up
   \once \override Staff.BarLine #'extra-offset = #'(0 . 1)
   \bar "|"
@@ -52,13 +56,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 +82,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,11 +93,10 @@ voice = \notes \relative c' {
   \bar "|."
 }
 
-stich = \notes \relative c'' {
+stich =  \relative c'' {
   \override Staff.NoteCollision #'merge-differently-dotted = ##t
   \set fontSize = #-3
-  %% broken?
-  \override Stem #'beamed-lengths = #(map (lambda (x) (* 0.2 x)) '(3.26))
+  \override Stem #'length-fraction = #(magstep -3)
 
   \voiceTwo
   \partial 4
@@ -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,10 +142,10 @@ 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 {
@@ -167,10 +170,10 @@ oneHalfNoteTime = \markup {
       \setMargins
      
       %% Less vertical space needed with lyrics
-      \set Staff.minimumVerticalExtent = #'(2 . 2)
+      \override Staff.VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2)
       
       %% Custom time signature
-      \override Staff.TimeSignature #'print-function = #Text_item::print
+      \override Staff.TimeSignature #'stencil = #Text_interface::print
       \override Staff.TimeSignature #'text = #oneHalfNoteTime
       \noclefs
     
@@ -178,12 +181,12 @@ oneHalfNoteTime = \markup {
       \context Voice = "stich" \stich
     >>
     \lyricsto "voice" \new Lyrics {
-      \set minimumVerticalExtent = #'(2 . 2)
+      \override VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2)
       \text
     }
   >>
-  \paper {}
-%  \midi {}
+  \layout {}
+  \midi {}
 }
 
 %%% Local variables: