X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fwilhelmus.ly;h=a6b00e404f20d442423776d1fd1d5d9e28c220a1;hb=7afabf835c8ff7b5a5f9ed564574789522c2cf0f;hp=ab0eac6695ab88a0d7a33911ac2944b20f5bcfbd;hpb=1e66bfb9ec0ebc1b7c09ad9f2256bd77f2230269;p=lilypond.git

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index ab0eac6695..a6b00e404f 100644
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.3.0"
+\version "2.10.0"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -11,83 +11,73 @@
 }
 
 %% hymn tricks
-#(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)))))))
-
-#(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
-  \context Staff \applycontext #(set-extra-space 'TimeSignature 'first-note 4.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 4.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 "|"
 }
 
-endBarLine = {
-
-}
-
 myBreak = { \bar "" \break }
 
-\paper {
+\layout {
   indent = 0.0\mm
-  linewidth = 120.0\mm
+  line-width = 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
-  b8 | c4 b a a | g2.
+  b8 | c4 b a a | g2. \myBreak
 
-  d4 | g g a a | b a8
-  b8 | c4 b a a| g2.
+  d4 | g g a a | b a8 \myBreak
+  b8 | c4 b a a| g2.  \myBreak
 
-  b8[ c] | d2 e4 d2 c4 | b a8
-  b8 | c4 b a g | a2.
+  %% Hack for better left tekst margin
+  %% b8[ c] | d2 e4 d2 c4 | b a8 \myBreak
+  \set melismaBusyProperties = #'()
+  b8[ c] |
+  \unset melismaBusyProperties
+  d2 e4 d2 c4 b | a8 \myBreak
+  b8 | c4 b a g | a2. \myBreak
 
-  d,4 | g4.\melisma a8\melismaEnd b2 a2 g4 | fis e8
-  d8 | e4 g g fis |
+  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
 
-
-  \override Staff.BarLine #'extra-offset = #'(12 . 0)
+  %% justified lines:
+  %%\override Staff.BarLine #'extra-offset = #'(12 . 0)
+  %% ragged-right:
+  \override Staff.BarLine #'extra-offset = #'(23 . 0)
   \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
@@ -104,7 +94,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,
 
@@ -118,12 +108,14 @@ 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,
   blyf ick tot in den doot!
-  Een Prin -- ce van O -- ran -- gien
+  %% Hack for better left text margin:
+  %% Een Prin -- ce van O -- ran -- gien
+  Een " " Prin -- ce van O -- ran -- gien
   Ben ick, vry, on -- ver -- veert;
   Den Co -- ninck van His -- pan -- gien
   Heb ick al -- tijt ghe -- eert.
@@ -131,16 +123,26 @@ 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.6 }
+  }
 }
 
-linebreaks = \notes {
-  \repeat unfold 2 { s4 s1 s4 s8 \bar "" \break
-		     s8 s1 s2. \bar "" \break }
-  s4 s2*3 s4 s8 \bar "" \break
-  s8 s1 s2. \bar "" \break
-  s4 s4*7 s4. \bar "" \break
-  s8 s1 s\breve \endBarLine
+\layout {
+  ragged-right = ##t
+
+  \context {
+    \Score
+    %% defaults
+    %% (shortest-duration-space . 2.0)
+    %% (spacing-increment . 1.2)
+    %% (base-shortest-duration . ,(ly:make-moment 1 8))
+    %% wider spacing
+    \override SpacingSpanner #'shortest-duration-space = #3.0
+    \override SpacingSpanner #'spacing-increment = #1.2
+    \override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 8)
+  }
 }
 
 \score {
@@ -152,25 +154,24 @@ linebreaks = \notes {
       \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 = #ly:text-interface::print
       \override Staff.TimeSignature #'text = #oneHalfNoteTime
-    
-      \context Voice = "voice" \voice
-      \linebreaks
+      \override Staff.TimeSignature #'style = #'()
       \noclefs
-      
-      \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
     }
   >>
-  \paper {}
-%  \midi {}
+  \layout {}
+  \midi {}
 }
 
 %%% Local variables: