release: 1.1.44

[lilypond.git] / input / test / denneboom.ly

diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly
index 81a9f726a0ae673ca2abd6f92840dafa45982f6f..dc382e07a6ab720a981acb7e8894f47bf93286ce 100644 (file)
--- a/input/test/denneboom.ly
+++ b/input/test/denneboom.ly
@@ -7,9 +7,9 @@ TestedFeatures = "This file tests silly line shapes";
 
 \include "paper20.ly"
 
-\version "1.0.2";
+\version "1.0.20";
 
-oden = \lyric{ 
+oden = \lyrics{ 
        O8 |
        den-8. ne-16 boom,4. o8 | 
        den-8. ne-16 boom.4.  Wat8 |
@@ -17,7 +17,7 @@ oden = \lyric{
        won-8. der-16 schoon4 _8
 }
 
-ikheb = \lyric{
+ikheb = \lyrics{
        Ik8 | 
        heb u laatst4. in_'t8 |
        bos8. zien16 staan4 _8 toen8 |
@@ -25,7 +25,7 @@ ikheb = \lyric{
        kaars-8. jes16 aan.4 _8
 }
 
-ugloeit = \lyric{
+ugloeit = \lyrics{
        U8 |
        gloeit in bar-4. re8 | 
        win-8. ter-16 tijd,4 r8 als8 |
@@ -33,7 +33,7 @@ ugloeit = \lyric{
        licht8. ge-16 spreid.4 _8
 }
 
-oboom = \melodic\transpose c''{
+oboom = \notes\transpose c''{
        g,8 |
        c8. c16 c4. d8 | 
        e8. e16 e4. e8 | 
@@ -41,7 +41,7 @@ oboom = \melodic\transpose c''{
        d8. c16 c4 r8
 }
 
-bos = \melodic\transpose c''{
+bos = \notes\transpose c''{
        g8 | 
        g e a4. g8 | 
        g8. f16 f4 r8 f8 |
@@ -49,44 +49,44 @@ bos = \melodic\transpose c''{
        f8. e16 e4 r8
 }
 
-global = \melodic{ 
+global = \notes{ 
        \time 3/4;
        \partial 8;
        \skip 4*48;
        \bar "|.";
 }
-melody = \melodic{
+melody = \notes{
        \oboom
        \oboom
        \bos
        \oboom
 }
 
-$melody_staff = \type Staff = melody <
+$melody_staff = \context Staff = melody <
        \global
        \melody
 >
 
-$verse_one = \melodic{
+$verse_one = \notes{
        \oden
        \oden
        \ikheb
        \oden
 }
 
-$verse_one_staff = \type Lyrics = one <
+$verse_one_staff = \context Lyrics = one <
        \global
        \$verse_one
 >
 
-$verse_two = \melodic{
+$verse_two = \notes{
        \oden
        \oden
        \ugloeit
        \oden
 }
 
-$verse_two_staff = \type Lyrics = two <
+$verse_two_staff = \context Lyrics = two <
        \global
        \$verse_two
 >
@@ -121,7 +121,7 @@ $denneboom_shape = \paper{
 %              \$denneboom_shape 
        \paper_twenty
        indent = 20. \mm;
-       \shape = 70. \mm 20. \mm
+       \shape = 70. \mm 50. \mm
                 65. \mm 30. \mm
                 57.5 \mm 45. \mm
                 50. \mm 60. \mm