(main): use commands.mkarg () to quote

[lilypond.git] / input / wilhelmus.ly

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index 07d7cc1ee9843473d97bd45a2088df8c9f17c1a7..73806699fe0c0bd5d29bf6f29a2a6721a23df411 100644 (file)
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.7.10"
+\version "2.7.14"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -48,7 +48,7 @@ setMargins = {
 
 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 "|"
@@ -96,8 +96,7 @@ voice =  \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
@@ -171,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_interface::print
+      \override Staff.TimeSignature #'stencil = #Text_interface::print
       \override Staff.TimeSignature #'text = #oneHalfNoteTime
       \noclefs
     
@@ -182,7 +181,7 @@ oneHalfNoteTime = \markup {
       \context Voice = "stich" \stich
     >>
     \lyricsto "voice" \new Lyrics {
-      \set minimumVerticalExtent = #'(2 . 2)
+      \override VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2)
       \text
     }
   >>