X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Ftest%2Fdenneboom.ly;h=bdbf2ee191f6bd3278e915dd9e413280e7ca2d1a;hb=59ed0cee2aae58a3f0483f21261c68aee406fa10;hp=f870302100282f86793f6d92bcce6d3724580d89;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly
index f870302100..bdbf2ee191 100644
--- 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 "0.1.10";
+\version "1.0.7";
 
-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,17 +33,15 @@ ugloeit = \lyric{
 	licht8. ge-16 spreid.4 _8
 }
 
-oboom = \melodic{
-	\octave c';
-	'g8 |
+oboom = \notes\transpose c''{
+	g,8 |
 	c8. c16 c4. d8 | 
 	e8. e16 e4. e8 | 
-	d  e f4 'b | 
+	d  e f4 b, | 
 	d8. c16 c4 r8
 }
 
-bos = \melodic{
-	\octave c';
+bos = \notes\transpose c''{
 	g8 | 
 	g e a4. g8 | 
 	g8. f16 f4 r8 f8 |
@@ -51,13 +49,13 @@ bos = \melodic{
 	f8. e16 e4 r8
 }
 
-global = \melodic{ 
-	\meter 3/4;
+global = \notes{ 
+	\time 3/4;
     	\partial 8;
 	\skip 4*48;
 	\bar "|.";
 }
-melody = \melodic{
+melody = \notes{
 	\oboom
 	\oboom
 	\bos
@@ -69,7 +67,7 @@ $melody_staff = \type Staff = melody <
 	\melody
 >
 
-$verse_one = \melodic{
+$verse_one = \notes{
 	\oden
 	\oden
 	\ikheb
@@ -81,7 +79,7 @@ $verse_one_staff = \type Lyrics = one <
 	\$verse_one
 >
 
-$verse_two = \melodic{
+$verse_two = \notes{
 	\oden
 	\oden
 	\ugloeit
@@ -123,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