Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / input / wilhelmus.ly

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index d7cbcf502681304e35eea8e47bfb25665ff88f6f..4ae2161c109a0f632076c80ec5accc643157dd10 100644 (file)
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.10.0"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -35,20 +35,20 @@ noclefs =  {
 setMargins = {
   %% first line left margin
   %% justified:
-  %% \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 4.5)
+  %% ragged-right:
+  \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 "|"
@@ -58,7 +58,7 @@ myBreak = { \bar "" \break }
 
 \layout {
   indent = 0.0\mm
-  linewidth = 120.0\mm
+  line-width = 120.0\mm
   textheight = 270.0\mm
 }
 
@@ -88,7 +88,7 @@ voice =  \relative c' {
 
   %% justified lines:
   %%\override Staff.BarLine #'extra-offset = #'(12 . 0)
-  %% raggedright:
+  %% ragged-right:
   \override Staff.BarLine #'extra-offset = #'(23 . 0)
   \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
@@ -147,7 +146,7 @@ oneHalfNoteTime = \markup {
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 
   \context {
     \Score
@@ -171,18 +170,18 @@ 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 = #ly:text-interface::print
       \override Staff.TimeSignature #'text = #oneHalfNoteTime
       \noclefs
     
-      \context Voice = "voice" \voice
-      \context Voice = "stich" \stich
+      \new Voice =  "voice" \voice
+      \new Voice =  "stich" \stich
     >>
     \lyricsto "voice" \new Lyrics {
-      \set minimumVerticalExtent = #'(2 . 2)
+      \override VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2)
       \text
     }
   >>