X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fcadenza.ly;h=54abee9d043b410edfcb63e12c0f88fc549abebf;hb=69b9cead5afe7164b9053d26eba582fec3825ef8;hp=3bdc51e5a30dfc81f72c6b8ed2b61cece4874c04;hpb=0dc651561ed849b121d26cbd07a192e9fefeb832;p=lilypond.git

diff --git a/input/cadenza.ly b/input/cadenza.ly
index 3bdc51e5a3..54abee9d04 100644
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -1,65 +1,67 @@
-%{MudelaHeader
- title:
- description:Cadenza to Mozart Horn concerto 3
- composer(s):unknown
- entered-by:HWN
- copyright: public domain
+\header{
+filename =	 "cadenza.ly";
+title =	 "Cadenza ad libitum";
+description =	 "Cadenza to Mozart Horn concerto 3";
+composer =	 "unknown";
+enteredby =	 "HWN";
+copyright =	 "public domain";
+}
 
- Tested Features: cadenza mode
+%{
+Tested Features: cadenza mode
 
-EndMudelaHeader
-%}
+Ugh.. Wish we had grace notes....  It adds another dimension to this
+piece of music.  %}
 
-\version "0.0.60";
+\version "0.1.10";
 
 
 cad = \melodic  {
-		\cadenza 1;
-		\grouping 1*4;\duration  8;\octave c';
+	\property Score.instrument = "french horn"
+	\type Staff {
+	\cadenza 1;
+	\grouping 1*4;
+	\octave c';
 
-	\clef \violin ;
+	\clef "violin";
 	c'4.\mf g8
 
 
-	[e'^"accel" ~ d' c' b]
-	[b~ c'] g-\fermata
-		\bar \empty;
+	[e'^"accel" () d' c' b]
+	[b() c'] g-\fermata
+		\bar "empty";
 			c [c_"rubato" e g c']
 	\octave c'';
-	e4. e [g ~ f_"rit" e d]
+	e4. e8 [g () f_"rit" e d]
+
+	dis4() e4
+		\bar "" ;
+		r8 [c16 d] [e f g gis]
+
+	a4-> 'f() 'e g
+	f-> 'd() 'cis e
 
-	\duration 16;
-	dis4~ e4
-		\bar \empty ;
-		r8 [c d] [e f g gis]
-	\duration 4;
-	a-> 'f~ 'e g
-	f-> 'd~ 'cis e
-	\duration 8;	
 	d4^\fermata
-		\bar \empty ;
+		\bar "" ;
 
 	r8 'a ['b cis]
-	\duration 16;	[d cis d e]
-	f4~ [f e d c]
-	'b4
+	[d16 cis d e]
+	f4() [f16 e d c]
+	'b4-\turn
 	\octave c'; [2/3 d'8 c'8 a8]1/1
 	g2
-		\bar \empty ;
-	[g c e g] [c' e g c']\octave c''; 
-	[e 'g c e] g4^\fermata %~ % BUG!
-		\bar \empty ;
-	[g8.(_"a tempo" e g8. )e]
+		\bar "" ;
+	[g16 c e g] [c' e g c']\octave c''; 
+	[e 'g c e] g4^\fermata 
+		\bar "" ;
+	[g8.(_"a tempo" e16 g8. )e16]
 	a4. g8 [f8 e8 d8 c8]
-	'g2 d2^"tr"
+	'g2 d2-\trill
 	c4
-	}
-
+	}}
 \score {
-	\melodic{ \cad }
+	\melodic { \cad }
+	\midi { \tempo 4 = 90; }
 	\paper {
-	
-		\unitspace 14.0\mm;
-		\geometric 1.4;}
-%	\midi { \tempo 4:90 }
+	}
 }