More original lyrics. Add to examples.

diff --git a/ChangeLog b/ChangeLog
index 832c6a7e79d553490eba92ea2f85f37ff360fd00..e57c464136a63ec6a191cd94fe1b83b5a131adb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-31  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * input/wilhelmus.ly: More original lyrics.  Add to examples.
+
        * stepmake/stepmake/generic-targets.make ($(outdir)/dummy.dep):
        Reinstate old code that issues warning.  Fixes --srcdir build.
 

diff --git a/input/GNUmakefile b/input/GNUmakefile
index a738f04d6a1c2461410c4c2a650f1479aa7caf26..f928659815b36f278060c5156585aad1e4ef268d 100644 (file)
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -2,7 +2,7 @@ depth = ..
 
 SUBDIRS=test regression tutorial no-notation template mutopia 
 
-examples= les-nereides puer-fragment
+examples= les-nereides puer-fragment wilhelmus
 
 LOCALSTEPMAKE_TEMPLATES=ly mutopia
 EXTRA_DIST_FILES=paddy.abc

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index 7d753749e282825b8a29a56225a74fa4f135816e..f9f0cc7c7681fd77bce7e13742005208dcc09127 100644 (file)
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -99,11 +99,11 @@ stich = \notes \relative c'' {
   s8 s s2 s4 s2 s4 s s8
   s8 s4 s s s s2.
 
-  s4 g8 fis g a s2 s2 s4 s s8
+  s4 g8[ fis g a] s2 s2 s4 s s8
   s8 e8[ fis]
 }
 
-text = \lyrics {
+modernText = \lyrics {
   Wil -- hel -- mus van Nas -- sou -- we
   ben ik van duit -- sen bloed,
 
@@ -117,6 +117,17 @@ text = \lyrics {
   heb ik al -- tijd ge -- eerd.
 }
 
+text = \lyrics {
+  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
+  Ben ick, vry, on -- ver -- veert;
+  Den Co -- ninck van His -- pan -- gien
+  Heb ick al -- tijt ghe -- eert.
+}
+
 oneHalfNoteTime = \markup {
   \override #'(baseline-skip . 0)
   \column < { \number "1" } { \smaller \smaller \note #"2" #-0.5 } >
@@ -135,6 +146,7 @@ linebreaks = \notes {
   \context Score <<
     \context Staff <<
       \override Staff.StaffSymbol #'width = #'80
+      \set Staff.autoBeaming = ##f
       \margins
       \smallBarLines