Merge branch 'master' into dev/texi2html

[lilypond.git] / input / wilhelmus.ly

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index 5edc1c1c62ad6be5933fcaabe75ca2397d543521..3cd7cf698d66eefee2ad6c3e55e8d788f594d771 100644 (file)
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.7.31"
+\version "2.11.51"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -11,21 +11,6 @@
 }
 
 %% hymn tricks
-#(define (prepend-grob-property grob-name
-         grob-prop entry)
-  (lambda (context)
-   (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 =  {
   s1
   \override Staff.Clef #'break-visibility =
@@ -33,17 +18,13 @@ 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)
-  
-  %% next lines left margin
-  \context Staff \applyContext #(set-extra-space 'KeySignature 'staff-bar 15)
+  %% \context Staff \applyContext #(set-extra-space 'TimeSignature
+  %% 'first-note -> extra-space 4.5
+
+  \override Staff.TimeSignature #'space-alist #'first-note = #'(extra-space . 9.5)
+  \override Staff.KeySignature #'space-alist #'staff-bar = #'(extra-space . 15)
+  \override Score.LeftEdge #'space-alist #'key-signature = #'(extra-space . 1)
   
-  %% next lines small key-signature margin
-  \context Staff \applyContext #(set-extra-space 'LeftEdge 'key-signature 1.0)
 }
 
 pipeSymbol = {
@@ -58,7 +39,7 @@ myBreak = { \bar "" \break }
 
 \layout {
   indent = 0.0\mm
-  linewidth = 120.0\mm
+  line-width = 120.0\mm
   textheight = 270.0\mm
 }
 
@@ -88,7 +69,7 @@ voice =  \relative c' {
 
   %% justified lines:
   %%\override Staff.BarLine #'extra-offset = #'(12 . 0)
-  %% raggedright:
+  %% ragged-right:
   \override Staff.BarLine #'extra-offset = #'(23 . 0)
   \bar "|."
 }
@@ -142,11 +123,14 @@ text = \lyricmode {
 
 oneHalfNoteTime = \markup {
   \override #'(baseline-skip . 0)
-  \column { \line { \number "1" } \line { \smaller \smaller \note #"2" #-0.5 } }
+  \column {
+    \line { \number "1" }
+    \line { \smaller \smaller \note #"2" #-0.6 }
+  }
 }
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 
   \context {
     \Score
@@ -175,10 +159,11 @@ oneHalfNoteTime = \markup {
       %% Custom time signature
       \override Staff.TimeSignature #'stencil = #ly:text-interface::print
       \override Staff.TimeSignature #'text = #oneHalfNoteTime
+      \override Staff.TimeSignature #'style = #'()
       \noclefs
     
-      \context Voice = "voice" \voice
-      \context Voice = "stich" \stich
+      \new Voice =  "voice" \voice
+      \new Voice =  "stich" \stich
     >>
     \lyricsto "voice" \new Lyrics {
       \override VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2)