From: fred <fred>
Date: Sun, 24 Mar 2002 20:05:22 +0000 (+0000)
Subject: lilypond-0.1.44
X-Git-Tag: release/1.5.59~3459
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e5461e519d5d325aed0829284a140ecab88709cc;p=lilypond.git

lilypond-0.1.44
---

diff --git a/init/paper16.ly b/init/paper16.ly
index ecca65ae45..69cac72395 100644
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -13,7 +13,7 @@ paper sizes.
 %}
 paper_sixteen = \paper {
 	linewidth = 15.5 \cm;
-	indent = 5.\mm;
+	indent = 10.\mm;
 	rulethickness = 0.4\pt;
 	barsize = 16.0 \pt;
 	interline = 4.\pt;
diff --git a/init/paper20.ly b/init/paper20.ly
index 62322672de..d9302be296 100644
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -4,7 +4,7 @@
 
 paper_twenty = \paper {
 	linewidth = 15.0 \cm;
-	indent = 10.\mm;
+	indent = 12.\mm;
 	rulethickness = 0.4\pt;
 	barsize = 20.0 \pt;
 	interline = 5.\pt;
diff --git a/input/denneboom.ly b/input/denneboom.ly
index 1027b2af77..4eef4dbf42 100644
--- a/input/denneboom.ly
+++ b/input/denneboom.ly
@@ -5,50 +5,102 @@ copyright =	 "public domain";
 TestedFeatures = "This file tests silly line shapes";
 }
 
-\version "0.1.8";
+\include "paper13.ly"
 
-boom = \lyric{
-	\meter 1/4;
-	O4 den- ne- boom, o den- ne- boom.
-	Wat zijn uw tak- ken won- der- schoon
-	O den- ne- boom, o den- ne- boom.
-	Wat zijn uw tak- ken won- der- schoon
-	Ik heb u laatst in 't bos zien staan
-	toen zat- en er geen kaarsjes aan.
-	O, Den- ne- boom, o den- ne- boom.
-	Wat zijn uw tak- ken wonder- schoon
+\version "0.1.9";
 
-	O den- ne- boom, o den- ne- boom.
-	Wat zijn uw tak- ken won- der- schoon
-	O den- ne- boom, o den- ne- boom.
-	Wat zijn uw tak- ken won- der- schoon
-	U gloeit in bar- re winter- tijd, 
-% ugh
-%	als sneeuw op aar- de licht ge- spreid.
-%	O, Den- ne- boom, o den- ne- boom.
-%	Wat zijn uw tak- ken wonder- schoon
+oden = \lyric{ 
+	_8 O8 den-8. ne-16 boom,4 _8 o8 den-8. ne-16 boom.4.
+	Wat8 zijn uw tak-4 ken won-8. der-16 schoon4.
 }
 
-ugh = \melodic{
+ikheb = \lyric{
+	Ik8 heb u laatst4. in_'t8 bos8. zien16 staan4.
+	toen8 zat- en er4. geen8 kaars-8. jes16 aan.4
+}
+
+ugloeit = \lyric{
+	U8 gloeit in bar-4. re8 win-8. ter-16 tijd,4.
+	als8 sneeuw op aar-4. de8 licht8. ge-16 spreid.4
+}
+
+oboom = \melodic{
 	\octave c';
-	\meter 1/4;
-	c d e f | c d e f | c d e f | c d e f |
-	c d e f | c d e f | c d e f | c d e f |
-	c d e f | c d e f | c d e f | c d e f |
-	c d e f | c d e f | c d e f | c d e f |
-	c d e f | c d e f | c d e f | c d e f |
-	c d e f | c d e f | c d e f | c d e f |
-	c d e f | c d e f | c d e
+	r8 'g8 |
+	c8. c16 c4 r8 d8 | 
+	e8. e16 e4 r8 e8 d  e  | 
+	f4 'b d8. c16 c4
+}
+
+bos = \melodic{
+	\octave c';
+	r8 g8 g e |
+	a4 r8 g8 g8. f16 f4 r8 f8 f d |
+	g4 r8 f8 f8. e16 e4 
+}
+
+global = \melodic{
+	\meter 3/4;
+    	\partial 4;
+	\skip 4*1;
+	\skip 4*3;
+	\meter 4/4;
+	\skip 4*4;
+	\meter 6/4;
+	\skip 4*12;
+	\meter 5/4;
+	\skip 4*5;
+	\meter 3/4;
+	\skip 4*3;
+	\meter 4/4;
+	\skip 4*4;
+	\meter 6/4;
+	\skip 4*5;
+
+	\bar "|.";
 }
 
 \score{
-%	<
-%		\type Lyrics \boom
-		\ugh
-%	>
+	<
+% {
+		\lyric \type Lyrics <
+			\multi 2 < 
+% huh?
+%				\global
+				{
+					\oden
+					\ikheb
+					\oden
+					
+%					_4
+%					\oden
+%					\ugloeit
+%					\oden
+				}
+				\global
+			>
+		>
+% }
+		\melodic \type Staff < 
+			\multi 2 < 
+				\global
+				{
+					\oboom
+					\bos
+					\oboom
+
+%					r4
+%					\oboom
+%					\bos
+%					\oboom
+				}
+			>
+		> 
+	>
 	\paper{
-		\indent = 20. \mm;
-		\shape = 72.5 \mm 15. \mm
+%		\paper_thirteen
+		indent = 20. \mm;
+		\shape = 70. \mm 20. \mm
 			 65. \mm 30. \mm
 			 57.5 \mm 45. \mm
 			 50. \mm 60. \mm
@@ -57,12 +109,43 @@ ugh = \melodic{
 			 27.5 \mm 105. \mm
 			 20. \mm 120. \mm
 			 10. \mm 140. \mm
-			  0. \mm 160. \mm
-			 72.5 \mm 15. \mm
-%			 72.5 \mm 15. \mm
-			 60. \mm 40. \mm
+%			  0. \mm 160. \mm
+			 65. \mm 30. \mm
 			 ;
-
+%{
+		\shape = % 72.5 \mm 15. \mm
+			 % 50. \mm 60. \mm
+			 70. \mm 30. \mm
+			 60. \mm 60. \mm
+			 50. \mm 80. \mm
+			 70. \mm 40. \mm
+			 50. \mm 80. \mm
+			 30. \mm 120. \mm
+			 60. \mm 60. \mm
+			 30. \mm 120. \mm
+			 20. \mm 140. \mm
+			 0. \mm 180. \mm
+			 70. \mm 30. \mm
+			 70. \mm 30. \mm
+			 70. \mm 30. \mm
+			 ;
+		\shape = 80. \mm 20. \mm
+			70. \mm 40. \mm
+			60. \mm 60. \mm
+			50. \mm 80. \mm
+			40. \mm 100. \mm
+			30. \mm 120. \mm
+			20. \mm 140. \mm
+			10. \mm 160. \mm
+%			00. \mm 180. \mm
+			75. \mm 30. \mm
+			;
+%}
 		gourlay_maxmeasures = 30.;
+%		arithmetic_basicspace = 1.2;
+%		arithmetic_multiplier = 2.8\pt;
+	}
+	\midi{
+		\tempo 4 = 90;
 	}
 }