patch::: 1.3.127.jcn4

[lilypond.git] / input / denneboom.ly

diff --git a/input/denneboom.ly b/input/denneboom.ly
index f088d1da8e281d4299cd00e1e75c66a2799e2306..7c2a080e46169f5ab5624c961aec333c534e7dfb 100644 (file)
--- a/input/denneboom.ly
+++ b/input/denneboom.ly
@@ -1,15 +1,15 @@
 \header{
-filename =      "denneboom.ly";
-enteredby =     "jcn";
-copyright =     "public domain";
+filename =      "denneboom.ly";
+enteredby =     "jcn";
+copyright =     "public domain";
 }
 %{ file tests silly line shapes %}
 
 \include "paper20.ly"
 
-\version "1.1.52";
+\version "1.3.120";
 
-oden = \lyrics{ 
+oden =  \lyrics{ 
        O |
        den- ne- boom, o | 
        den- ne- boom  Wat |
@@ -17,7 +17,7 @@ oden = \lyrics{
        won- der- schoon 
 }
 
-ikheb = \lyrics{
+ikheb =  \lyrics{
        Ik | 
        heb u laatst in_'t |
        bos zien staan  toen |
@@ -25,7 +25,7 @@ ikheb = \lyrics{
        kaars- jes aan 
 }
 
-ugloeit = \lyrics{
+ugloeit =  \lyrics{
        U |
        gloeit in bar- re | 
        win- ter- tijd, als |
@@ -33,7 +33,7 @@ ugloeit = \lyrics{
        licht ge- spreid 
 }
 
-oboom = \notes\transpose c''{
+oboom =  \notes\transpose c''{
        g,8 |
        c8. c16 c4. d8 | 
        e8. e16 e4. e8 | 
@@ -41,7 +41,7 @@ oboom = \notes\transpose c''{
        d8. c16 c4 r8
 }
 
-bos = \notes\transpose c''{
+bos =  \notes\transpose c''{
        g8 | 
        g e a4. g8 | 
        g8. f16 f4 r8 f8 |
@@ -50,7 +50,7 @@ bos = \notes\transpose c''{
 }
 
 
-melody = \notes{
+melody =  \notes{
        \oboom
        \oboom
        \bos
@@ -58,42 +58,47 @@ melody = \notes{
 }
 
 
-verse_one = \notes{
+verseOne =  \notes{
        \oden
        \oden
        \ikheb
        \oden
 }
 
-verse_one_staff = \context Lyrics = one 
+verseOneStaff =  \context Lyrics = one 
        \verse_one
 
 
-verse_two = \notes{
+verseTwo =  \notes{
        \oden
        \oden
        \ugloeit
        \oden
 }
 
-verse_two_staff = \context Lyrics = two 
+verseTwoStaff =  \context Lyrics = two 
        \verse_two
 
 
-denneboom_shape = \paper{ 
-       \paper_twenty
+denneboomShape =  \paper{ 
+       \paperTwenty
        indent = 20. \mm;
-       \shape   70. \mm, 20. \mm,
-                65. \mm, 30. \mm,
-                57.5 \mm, 45. \mm,
-                50. \mm, 60. \mm,
-                42.5 \mm, 75. \mm,
-                35. \mm, 90. \mm,
-                27.5 \mm, 105. \mm,
-                20. \mm, 120. \mm,
-                10. \mm, 140. \mm,
-                65. \mm, 30. \mm
-                ;
+
+       % UGH -- THIS IS HAIRY 
+       #'margin-shape = #(map
+               (lambda (x) (cons-map mm-to-pt x)) 
+               '((70.0 .  20.)
+                (65.0 .  30.0)
+                (57.5  .  45.0)
+                (50.0 .  60.0) 
+                (42.5  .  75.)  
+                (35.0 .  90.)
+                (27.5  .  105.)
+                (20.0 .  120.0)
+                (10.0 .  140.0) 
+                (65.0 .  30.0))
+       )
+
        gourlay_maxmeasures = 30.;
        arithmetic_basicspace = 3.8;
        arithmetic_multiplier = 8.\pt;