-\version "2.5.2"
+\version "2.10.0"
\header {
texidoc = "Wilhelmus van Nassouwe"
}
%% 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 = #(lambda (dir) (cons #t #t))
+ \override Staff.Clef #'break-visibility =
+ #all-invisible
}
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 = {
%% 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 "|"
\layout {
indent = 0.0\mm
- linewidth = 120.0\mm
+ line-width = 120.0\mm
textheight = 270.0\mm
}
%% justified lines:
%%\override Staff.BarLine #'extra-offset = #'(12 . 0)
- %% raggedright:
+ %% ragged-right:
\override Staff.BarLine #'extra-offset = #'(23 . 0)
\bar "|."
}
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
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 }
+ }
}
\layout {
- raggedright = ##t
+ ragged-right = ##t
\context {
\Score
\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
+ \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 {
- \set minimumVerticalExtent = #'(2 . 2)
+ \override VerticalAxisGroup #'minimum-Y-extent = #'(2 . 2)
\text
}
>>