From: fred <fred>
Date: Sun, 24 Mar 2002 19:35:47 +0000 (+0000)
Subject: lilypond-0.0.43
X-Git-Tag: release/1.5.59~5161
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a7dc0a2007a1901ada7689aaf7ff3b987445528;p=lilypond.git

lilypond-0.0.43
---

diff --git a/input/cadenza.ly b/input/cadenza.ly
index ecfda88354..ebef5ed7a1 100644
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -4,17 +4,18 @@
 % author: unknown. Copyright: none
 %
 
-cad = music { $
-	\duration { 8}
+cad = \music { 
+		\cadenza {1}
+		\grouping{1*4}\duration { 8}
 	\textstyle "italic"
 	\clef \violin 
-	'c4.\mf g8
+	c'4.mf g8
  	\textstyle  "roman" 
 
-	['e^"accel" ()'d 'c b]
-	[b()'c] g-\fermata
+	[e'^"accel" ()d' c' b]
+	[b()c'] g-\fermata
 		\bar \empty
-			c [c_"rubato" e g 'c]
+			c [c_"rubato" e g c']
 	\octave{'}
 	e4. e [g ()f_"rit" e d]
 
@@ -33,26 +34,23 @@ cad = music { $
 	\duration{16}	[d cis d e]
 	f4()[f e d c]
 	`b4
-	\octave{} ['d8 'c8 a8]2/3
+	\octave{} [d'8 c'8 a8]2/3
 	g2
 		\bar \empty 
-	[g c e g] ['c e g 'c]\octave{'} 
+	[g c e g] [c' e g c']\octave{'} 
 	[e `g c e] g4^\fermata %()% BUG!
 		\bar \empty 
-	[g8.(_"a tempo" e g8. )e]
+	[g8.(_"a \tempo" e g8. )e]
 	a4. g8 [f8 e8 d8 c8]
 	`g2 d2^"tr"
 	c4
-	$}
-
-score {
-	staff { melodic
-		music { cad }
 	}
-	commands {
-		cadenza {1}
-		grouping{1*4}
+
+\score {
+	\staff { \melodic
+		\music { cad }
 	}
-	paper {}
-	midi { tempo 4:80 }
+	
+	\paper {}
+	\midi { \tempo 4:90 }
 }
diff --git a/input/maartje.ly b/input/maartje.ly
index cf77a62bcc..ce3425fbb3 100644
--- a/input/maartje.ly
+++ b/input/maartje.ly
@@ -3,74 +3,77 @@
 % COPYRIGHT: GPL
 %
 %
+globals=\music{
+		\meter {4/ 4}
+		\partial {8}
+		\skip {1*8}
+		\skip {3*2 }
+		\bar ":|:"
+		\skip {1*2}
+		\meter {2/4}
+}
 
-ritme = staff {
+ritme = \staff {
 	rhythmic
-	music {$
+	\music{globals}
+	\music {
 	c8
 	|[a8() a8. a8 a16 a16 a16] c4.
 		
-	%[c8( )'a8() c8 c8]% BUG!
+	%[c8( )a'8() c8 c8]% BUG!
 	|c2 c2
 	
-	|[fis16 'dis16( fis16 'dis16 ][fis16) 'dis16 fis16 'dis16]
+	|[fis16 dis'16( fis16 dis'16 ][fis16) dis'16 fis16 dis'16]
 	| r32 r32 r16 r8 r4 r2
 	|[c8. c16] [c16 c8.] [c16 c16 c8] [c16 c8 c16]
 
 	 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2
 
-	$}
+	}
 }
 
 melody=
-staff {
-	melodic
-	music{$
+\staff {
+	\melodic
+	\music { globals }
+	\music{
 	c8\key{fis cis gis}
 	|r4 r4 r4 r4
-	|'cis2..	r8
+	|cis'2..	r8
 	| r4 r8 r16 r32 r32 
 
 	\duration {4}
-	{
-		\music { c () `bes [c8 c8] }
-		\music { 'fis ()'gisis fis8 fis8 }
-		\music { d () d dis8 dis8 }
-		\music {  a  () bes eis8 eis8 }
-		\music { fis () g gis8 gis8 }
-	}
+	<
+		 { c () `bes [c8 c8] }
+		 { fis' ()gisis' fis8 fis8 }
+		 { d () d dis8 dis8 }
+		 {  a  () bes eis8 eis8 }
+		 { fis () g gis8 gis8 }
+	>
 	\clef\tenor
-	{ c4 'c4 }
+	< c4 c'4 >
 
-	[d8 e8 'f8 g8]  d8 e8 f8 g8
-	|''fis2
-	| a8 b8 'c8 'd8 |''c8 ```c8 c4 |c4  c4 |c4
+	[d8 e8 f'8 g8]  d8 e8 f8 g8
+	|fis''2
+	| a8 b8 c'8 d'8 |c''8 ```c8 c4 |c4  c4 |c4
 	\duration{ 16 } `b `a `g `f \duration{ 4}
 	\clef\bass	
 
 	|c `b `a `g `f `e `d `c ``b ``a ``g ``f ``e ``d ``c
-	$}
+	}
 
 }
 
-score {
-	paper {
-		geometric 1.4
-		unitspace 3.0 cm
-	}
-%	staff { ritme } % broken for now
-	staff { melody }
-	commands {
-		meter {4* 4}
-		partial {8}
-		skip {1*8}
-		skip {3*2 }
-		bar ":|:"
-		skip {1*2}
-		meter {2*4}
-
+\score {
+	\paper {
+		\geometric 1.4
+		\unitspace 3.0 \cm
 	}
+%	\staff { ritme } % broken for now
+	\staff { melody }
+	
 }
 
 
 
+
diff --git a/input/rhythm.ly b/input/rhythm.ly
index 368d04b9bf..a3f64906ae 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -1,66 +1,65 @@
 %
-% 	I've got rhythm!
+% 	Ive' got rhythm!
 %
 % add any impressive examples here, please
 
-ritme = staff {
-	melodic
+ritme = \staff {
+	\melodic
 
-	music { $
+	\music { 
+	\partial {1*8}	% doesnt' have to be here. 
+		\meter{ 4/4}
 	c8					|
-
+	
 	[a8() a8. a8 a16 a16 a16] c4.		|	% watch the beams!
 	 r32 r32 r16 r8 r4 r2			|
-	\meter{  5*16}
+	\meter{  5/16}
 
 	% divide measure in 5 equal parts. Usually it 2+3 or 3+2
 	\grouping { 5*16 }	
 	[c8 c16 c8 ]				|	% watch THIS!
 	\plet{5/4} [c16 c16 c16 c16]\plet{1/1} |
-	\meter{  2*8}
+	\meter{  2/8}
 	c4 				|
 	c4	c4	c4	c4
-	\meter {4*4}
+	\meter {4/4}
 	c1 c1 c1
 	
 %	[c16 c16 c16 c16 ]			|
 %	[c16 c16 c16 c16 c16 ]			|
 %	[c16 c16 c16 c16 c16 ]			|	
 	
-	$ }
+	 }
 
 	%
-	% The commands section takes the same stuff that music { } takes;
-	% the commands issued below could have been issued inside the above
-	% music block;
+	% The \co\mmands section takes the same stuff that \music { } takes;
+	% the \co\mmands issued below could have been issued inside the above
+	% \music block;
 	%
 
-	commands {	% override "commands" section of Score.
-		partial {1*8}	% doesn't have to be here. 
-		meter{ 4*4}
-	}
+	
 }
-another = staff {
-	melodic
-	music { $
-		c1 c1 c1 c4 c4 c4 c4  \meter{ 4*4} c1 c1 c1
-	$ }
+another = \staff {
+	\melodic
+	\music { \meter{ 4/4} 
+		c1 c1 c1 c4 c4 c4 c4  \meter{ 4/4} c1 c1 c1
+	 }
 }
 
-yanother = staff {
-	melodic
-	music { $
+yanother = \staff {
+	\melodic
+	\music { \meter{ 4/4} 
 		c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
-	$ }
+	 }
 }
 
-score {
-	staff{ritme}
-	staff { another }
-	staff { yanother }
-	commands { meter {4*4 }}
-	paper {
-		unitspace 2cm
-		geometric 1.3
+\score {
+	\staff{ritme}
+	\staff { another }
+	\staff { yanother }
+	
+	\paper {
+		\unitspace 2\cm
+		\geometric 1.3
 	}
 }
diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index 6728826471..b9f848715b 100644
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -17,127 +17,96 @@
 % \metron{4=120}
 %
 % \meter{3/4}
-% \key\F		% key is F ( f-major )
-% \clef\alto		% use alto clef
-% \duration8		% default duration is 'eight note
+% \key\F		% \key is F ( f-major )
+% \clef\alto		% use alto \clef
+% \duration8		% default \duration is eight' note
 %
-% \verb{\nobarnumbers}	% issue MusiXTeX command
+% \verb{\no\barnumbers}	% issue MusiXTeX \co\mmand
 % \barnumbering0
 % \slope{30}		% Fool MusiXTeX into 30 / 10 steeper beam
-% \stemlength3		% shorter stemlength
+% \stemlength3		% shorter \stemlength
 %		% because piece is set very tightly
-%%1		% double comments are included in .tex file
-ii_menuetto = music {
-	$\clef"alto"
+%%1		% double co\mments are included in .tex file
+ii_menuetto = \music {
+	\clef"alto"\meter{3/4}
 	\key {bes}
 	\octave{}
 	\duration{8}
-	{ a2 f2 d2_"\f" } bes4-.  |
+	< a2 f2 d2 df > bes4-.  |
 %%2
-	{ [ bes^"1" e c_"2"_"4" }
-%	(^ )
-	a bes-. g-. ] a4-.^"4" |
+	< [ bes^"1" e c_"2"_"4" >
+		a bes-. g-. ] a4-.^"4" |
 %%3
-%	{ d4 `bes4-.\stemup } stemup: 2 voices?
-	{ d4 `bes4-. } g4-. [ f-. e-. ] |
+	< d4 `bes4-. > g4-. [ f-. e-. ] |
 %%4
-%	{ f `a } (^ e ) d cis-. `b-. `a-. ]
-%	[ f ( e ) d cis-. `b-. `a-. ]
-	{ [ f `a } e d cis-. `b-. `a-. ]
+	< [ f `a > e d cis-. `b-. `a-. ]
 %%5
-	{ a2 f2 d2 } bes4-. | %   @bes4-. |
+	< a2 f2 d2 > bes4-. | %   @bes4-. |
 %%6
-%	{  bes( e  }  ) a
-	{ [ bes e } a bes-. g-. ]
-	'c4-. | % ='c4-. |
+	< [ bes e > a bes-. g-. ]
+	c'4-. | % =c'4-. |
 %%7
-	{ a4-. f4}
-%	{ 'd4-.-\upbow f4 `bes4\stemdown }
-	{ 'd4-.-\upbow f4 `bes4 }
-%	{ 'e4-.-\downbow g4 `g4\stemdown } |
-	{ 'e4-.-\downbow g4 `g4 } |
+	< a4-. f4>
+	< d'4-.-upbow f4 `bes4 >
+	< e'4-.-downbow g4 `g4 > |
 %%8
-%	{ 'cis2.-\upbow e2. `a2.\stemdown } :|:%%sorry!!
-	{ 'cis2.-\upbow e2. `a2. } \bar ":|:"%%!! sorry!
+	< cis'2.-upbow e2. `a2. > \bar ":|:"%%!! sorry!
 %%9
 	\clef "violin"
-%	{ 'e2 a2_f\stemdown }
-	{ 'e2 a2_"\f" }
-	[ 'd( 'e16 )'f16 ] |
+	< e'2 a2 df >
+	[ d'( e'16 )f'16 ] |
 %%10
-%	[ { 'e( g } ) 'd 'cis_{ }_{ }_2 'e
-	{ [ 'e g } 'd 'cis_"2" 'e a( )g ] |
+	< [ e' g > d' cis'_"2" e' a( )g ] |
 %%11
-%	{ a4\stemup( f2\stemdown } ) 'd4\stemup
-%	{ 'cis4\stemup-. e4\stemdown }
-	{ \multivoice \music {\stem{1} a4(\stem{1}) 'd4 'cis4-. } \music { \stem{-1} f2 e4 } } |
+	< \multivoice  
+		{\stem{1} a4(\stem{1}) d'4 cis'4-. }
+		{ \stem{-1} f2 e4 } > |
 %%12
-%	{ 'g^4 d\stemdown } (^  'f 'e ) 'f 'd^3(^ ) ='c ] |
-	{ [ 'g^"4" d } 'f 'e 'f 'd^"3"( ) 'c ] |
-% %13
-%	{ bes2\stemup g4\stemdown } ( )  f4
-%	{ 'c4\stemup e4\stemdown }
-%	{ bes2 g4 } f4 { 'c4 e4 } |
+	< [ g'^"4" d > f' e' f' d'^"3"( ) c' ] |
+%%13
 	\clef "alto"% 
-	{ \multivoice
-		\music { \stem{1} bes2 'c4 }
-		\music { \stem{-1} g4(\stem{-1}) f4 e4 }% ugh
-	} |
-%%%14
-%%	[ { a( f } ) g a f ] { 'd4-\upbow e4 `bes4\stemdown } |
-	{ [ a f } g a f ] { 'd4-\upbow e4 `bes4 } |
-%%%15
-%%	{ 'c4-\downbow f4 `a4\stemdown } [ bes( )a g a ] |
-%	{ 'c4-\downbow f4 `a4 } [ bes( )a g a ] |
-%%%16
+	< \multivoice
+		 { \stem{1} bes2 c'4 }
+		 { \stem{-1} g4(\stem{-1}) f4 e4 }% ugh
+	> |
+%%14
+	< [ a f > g a f ] < d'4-upbow e4 `bes4 > |
+%%15
+	< c'4-\downbow f4 `a4 > [ bes( )a g a ] |
+%%16
 	[ f( e )f a-. g-. bes-. ] |
+%%17
+	< a2^"0" fis2_"3" > bes4 |
+%%18
+	< { [ c'( )bes c' a ] } { [ es ] } > fis4 |
+%%19
+	< d'4-downbow g4 `bes4 > < c'4-upbow g4 c4 > < [ bes d > a ] |
+%%20
+	< { [ c'( bes a )bes g( )bes ] } { [ d ] } { [ g ] } > |
+%%21
+	< \multivoice  {\stem{1}  d'4(\stem{1} ) cis'4 d'4 }  { \stem{-1} g2 f4 } > |
+%%22
+	< { [ g( )f g e ] } { [ cis ] } > < f4 d4 > |
+%%23
+	[ `g g ] < e4. `a4. > d-upbow |
+%%24
+	< d2.^"fine" `a2. `d2._"3 mins."> \bar ":|" % \bar ":||"
 %% \tighten		% use one line less
-%% \newline		% start new line
-%%	|
-%%%17
-%%	{ a2^0^\tr fis2_3 } bes4 |
-	{ a2^"0" fis2_"3" } bes4 |
-%%%18
-%%	[ { 'c( es } ) bes 'c a ] fis4^\tr |
-	{ \music{ [ 'c( )bes 'c a ] } \music{ [ es ] } } fis4 |
-%%%19
-	{ 'd4-\downbow g4 `bes4 } { 'c4-\upbow g4 c4 } { [ bes d } a ] |
-%%%20
-%%	[ { 'c( d `g } bes a ) bes g ( ) bes ] |
-	{ \music{ [ 'c( bes a )bes g( )bes ] } \music{ [ d ] } \music{ [ g ] } } |
-%%%21
-%%	{ 'd4\stemup g2\stemdown } (^ ) 'cis4\stemup { 'd4\stemup =f4\stemdown } |
-	{ \multivoice \music {\stem{1}  'd4(\stem{1} ) 'cis4 'd4 } \music { \stem{-1} g2 f4 } } |
-%%%22
-%%	[ { g(  cis } )f g e ] { f4 d4 } |
-	{ \music{ [ g( )f g e ] } \music{ [ cis ] } } { f4 d4 } |
-%%%23
-%%	[ `g g ] { e4.\stemup^\tr `a4.\stemdown } d\stemup-\upbow |
-	[ `g g ] { e4. `a4. } d-\upbow |
-%%%24
-%%	{ d2.^{fine}  `a2. `d2.\stemup_{ }_{ }_{3 mins.}}	s4 :||
-%%	{ \textstyle "italic" d2.^"fine" `a2. \textstyle "roman" `d2._"3 mins."} | % :||
-	{ d2.^"fine" `a2. `d2._"3 mins."} \bar ":|" % \bar ":||"
-%% \tighten		% use one line less
-	$
+	
 }
 
-score {
-	staff { 
-		melodic music { ii_menuetto }
-	}
-	commands {
-		meter {3 * 4}
+\score {
+	\staff { 
+		\melodic \music { $ii_menuetto }
 	}
-	paper {
-		symboltables { table_sixteen }
-		width 195mm
-		unitspace 9mm  % to get lily to use only three lines
-		geometric 1.4
-		output "scsii-menuetto.out"
+	\paper {
+		\width 195\mm
+		\unitspace 9\mm  % to get lily to use only three lines
+		\geometric 1.4
+		\output "scsii-menuetto.out"
 	}
-	midi { 
-		tempo 4:120
-		output "scsii-menuetto.midi"
+	\midi { 
+		\tempo 4:120
+		\output "scsii-menuetto.midi"
 	}
 }