New file.

diff --git a/ChangeLog b/ChangeLog
index f25cbd73e498c357cd6234e97e70d74a22f4b4b2..d5348b9b73c99287f3aa7a4888bdc03ea248db19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * input/wilhelmus.ly: New file.
+
        * Documentation/user/notation.itely: 
        * Documentation/user/introduction.itely:
        * Documentation/user/tutorial.itely: Use quote ly-option instead

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
new file mode 100644 (file)
index 0000000..7d75374
--- /dev/null
+++ b/input/wilhelmus.ly
@@ -0,0 +1,178 @@
+\version "2.1.34"
+
+\header {
+  texidoc = "Wilhelmus van Nassouwe"
+  title = "Wilhelmus van Nassouwe"
+  composer = "Valerius"
+  subtitle = "Neder-landtsche gedenck-clanck"
+  opus = "1626"
+  copyright = "public domain"
+  enteredby = "janneke@gnu.org"
+}
+
+%% 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)
+
+  %% using StaffSymbol.width now
+  %% right margin
+  %%\applycontext #(set-extra-space 'BarLine 'right-edge 12.5)
+}
+
+smallBarLines = {
+  %% Set height of bar line to 2 staff-spaces
+  \override Staff.BarLine #'bar-size-procedure = #(lambda (x) 2)
+  %% Move barline one staff-space up
+  \override Staff.BarLine #'extra-offset = #'(0 . 1)
+}
+
+endBarLine = {
+  \revert Staff.BarLine #'bar-size-procedure
+  \revert Staff.BarLine #'extra-offset
+  \override Staff.BarLine #'extra-offset = #'(12 . 0)
+  \bar "|."
+}
+
+\paper {
+  indent = 0.0\mm
+  linewidth = 120.0\mm
+  textheight = 270.0\mm
+}
+
+voice = \notes \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.
+
+  d,4 g4.\melisma a8\melismaEnd b2 a2 g4 fis e8
+  d8 e4 g g fis
+  \override NoteHead #'style = #'neo_mensural
+  g\breve
+}
+
+stich = \notes \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))
+
+  \voiceTwo
+  \partial 4
+  s4 s s a8[ b] c[ a] s4.
+  s8 s4 s a8 g s4 s2.
+
+  s4 s s a8[ b] c[ a] s4.
+  s8 s4 s a8 g s4 s2.
+  
+  s8 s s2 s4 s2 s4 s s8
+  s8 s4 s s s s2.
+
+  s4 g8 fis g a s2 s2 s4 s s8
+  s8 e8[ fis]
+}
+
+text = \lyrics {
+  Wil -- hel -- mus van Nas -- sou -- we
+  ben ik van duit -- sen bloed,
+
+  den va -- der -- land ge -- trou -- we
+  blijf ik tot in den dood.
+
+  Een prin -- se van O -- ran -- je
+  ben ik vrij on -- ver -- veerd,
+
+  den ko -- ning van His -- pan -- je
+  heb ik al -- tijd ge -- eerd.
+}
+
+oneHalfNoteTime = \markup {
+  \override #'(baseline-skip . 0)
+  \column < { \number "1" } { \smaller \smaller \note #"2" #-0.5 } >
+}
+
+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
+}
+
+\score {
+  \context Score <<
+    \context Staff <<
+      \override Staff.StaffSymbol #'width = #'80
+      \margins
+      \smallBarLines
+
+      %% 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)
+      
+      %% Custom time signature
+      \override Staff.TimeSignature #'print-function = #Text_item::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
+    >>
+    \lyricsto "voice" \new Lyrics {
+      \set minimumVerticalExtent = #'(2 . 2)
+      \text
+    }
+  >>
+  \paper {}
+%  \midi {}
+}
+
+%%% Local variables:
+%%% LilyPond-indent-level:2
+%%% End:

diff --git a/scm/lily.scm b/scm/lily.scm
index 2360da093a76f0da53701728980fab8cf43ba21b..7528e0efee3538de87bf6147e2f146f26aa0f249 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -126,9 +126,7 @@
   (string<? (symbol->string (car x))
            (symbol->string (car y))))
 
-
-
-(define (chain-assoc x alist-list)
+(define-public (chain-assoc x alist-list)
   (if (null? alist-list)
       #f
       (let* ((handle (assoc x (car alist-list))))
@@ -136,8 +134,7 @@
            handle
            (chain-assoc x (cdr alist-list))))))
 
-
-(define (chain-assoc-get x alist-list . default)
+(define-public (chain-assoc-get x alist-list . default)
   "Return ALIST entry for X. Return DEFAULT (optional, else #f) if not
 found."