X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fwilhelmus.ly;h=411ed3c7b54dae517919f07caa7171ddeffa0fc3;hb=d31248d7770fb5770c2caacfb3547984bf8dcdc3;hp=f9f0cc7c7681fd77bce7e13742005208dcc09127;hpb=c32505a0ba095b5346a3fa48bfb5929b06b4e21f;p=lilypond.git

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index f9f0cc7c76..411ed3c7b5 100644
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.1.34"
+\version "2.12.0"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
@@ -11,82 +11,73 @@
 }
 
 %% hymn tricks
-#(define (override-alist-property grob-name alist-property entry)
-  (lambda (context)
-    (let* ((grob-properties (ly:context-property context grob-name))
-	   (alist-cons (chain-assoc-get alist-property grob-properties '()))
-	   (new-alist-cons (assoc-set! alist-cons (car entry) (cdr entry)))
-	   (new-props (assoc-set! (car grob-properties)
-				  alist-property new-alist-cons)))
-      (ly:context-set-property! context grob-name (list new-props)))))
-  
-#(define (set-extra-space grob-name entry value)
-  (override-alist-property grob-name 'space-alist
-   ;;;huh, broken? --jcn
-   ;;;(cons entry (cons 'fixed-space value))))
-   (cons entry (cons 'extra-space value))))
-      
-noclefs = \notes { s1 \set Staff.Clef = \turnOff }
-margins = {
-  %% first line left margin
-  \applycontext #(set-extra-space 'TimeSignature 'first-note 4.5)
-  
-  %% next lines left margin
-  %% \applycontext #(set-extra-space 'KeySignature 'first-note 15)
-  \applycontext #(set-extra-space 'KeySignature 'staff-bar 15)
-  
-  %% next lines small key-signature margin
-  \applycontext #(set-extra-space 'LeftEdge 'key-signature 1.0)
+noclefs =  {
+  s1
+  \override Staff.Clef #'break-visibility =
+    #all-invisible
+}
 
-  %% using StaffSymbol.width now
-  %% right margin
-  %%\applycontext #(set-extra-space 'BarLine 'right-edge 12.5)
+setMargins = {
+  %% \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)
+  
 }
 
-smallBarLines = {
+pipeSymbol = {
   %% Set height of bar line to 2 staff-spaces
-  \override Staff.BarLine #'bar-size-procedure = #(lambda (x) 2)
+  \once \override Staff.BarLine #'bar-size = #2
   %% Move barline one staff-space up
-  \override Staff.BarLine #'extra-offset = #'(0 . 1)
+  \once \override Staff.BarLine #'extra-offset = #'(0 . 1)
+  \bar "|"
 }
 
-endBarLine = {
-  \revert Staff.BarLine #'bar-size-procedure
-  \revert Staff.BarLine #'extra-offset
-  \override Staff.BarLine #'extra-offset = #'(12 . 0)
-  \bar "|."
-}
+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
-  \partial 4
-  d4 g g a a b a8
-  b8 c4 b a a g2.
-
-  d4 g g a a b a8
-  b8 c4 b a a g2.
-
-  b8[ c] d2 e4 d2 c4 b a8
-  b8 c4 b a g a2.
+  d4 | g g a a b | a8 \myBreak
+  b8 | c4 b a a | g2. \myBreak
+
+  d4 | g g a a | b a8 \myBreak
+  b8 | c4 b a a| g2.  \myBreak
+
+  %% 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 \myBreak
+  d8 | e4 g g fis | 
+  
+  \override NoteHead #'style = #'neomensural
 
-  d,4 g4.\melisma a8\melismaEnd b2 a2 g4 fis e8
-  d8 e4 g g fis
-  \override NoteHead #'style = #'neo_mensural
   g\breve
+
+  %% 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 Voice.Stem #'beamed-lengths = #(map (lambda (x) (* 0.2 x)) '(3.26))
+  \override Stem #'length-fraction = #(magstep -3)
 
   \voiceTwo
   \partial 4
@@ -103,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,
 
@@ -117,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.
@@ -130,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 {
@@ -147,42 +150,28 @@ linebreaks = \notes {
     \context Staff <<
       \override Staff.StaffSymbol #'width = #'80
       \set Staff.autoBeaming = ##f
-      \margins
-      \smallBarLines
-
+      \set Score.timing = ##f
+      \setMargins
+     
       %% Less vertical space needed with lyrics
-      \set Staff.minimumVerticalExtent = #'(2 . 2)
-      
-      %% Second time signature
-      %% \override Staff.TimeSignature   #'print-function =
-      %% #(second-time-signature '(3 . 2) Time_signature::print)
+      \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
-      
-      %% Invisible alternating time signature 
-      \notes {
-	\partial 4 s4
-	\override Staff.TimeSignature #'print-function = #'()
-	\repeat unfold 2 { \time 4/4 s1 \time 2/4 s2 \time 4/4 s1*2 }
-	\time 3/2 s2*3 \time 2/4 s2 \time 4/4 s1*2
-	\time 7/4 s4*7 \time 2/4 s2
-	\time 4/4 s1 \time 4/2 s1*2
-      }
-
-      \context Voice = "voice" \voice
-        \linebreaks
-        \noclefs
-      \context Voice = "stich" \stich
+      \override Staff.TimeSignature #'style = #'()
+      \noclefs
+    
+      \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: