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

lilypond-0.0.43
---

diff --git a/input/fugue1.midi.ly b/input/fugue1.midi.ly
index 1c730a6783..630b94a4ba 100644
--- a/input/fugue1.midi.ly
+++ b/input/fugue1.midi.ly
@@ -1,87 +1,87 @@
 % Creator: This is mi2mu 0.0.11.2 #14/FlowerLib 1.1.7 #1 of Mar 12 1997 02:11:21
 % Automatically generated, at Wed Mar 12 02:22:22 1997
-% from input file: fugue1.midi
+% from input file: fugue1.\midi
 
-track0 = music { $
-	% midi copyright:
+track0 = \music { 
+	% \midi copyright:
 	% instrument:
 	
-$} % track0
+} % track0
 
-track1 = music { $
-	% midi copyright:
+track1 = \music { 
+	% \midi copyright:
 	% instrument:
-	g8 a8 b8 'c8. { \music{ 'd16 } } { \music{ 'c16 } } 
-	{ \music{ b8 } } 'e8 a8 { \music{ 'd8. } } 'e16 
-	'd16 'c16 b16 g16 a16 b16 'c16 b16 'c16 'd16 'e16 
-	'd16 'e16 'fis16 'g8 b8 'c8 a8 'd16 'c16 b16 a16 { 
+	g8 a8 b8 c'8. { \music{ d'16 } } { \music{ c'16 } } 
+	{ \music{ b8 } } e'8 a8 { \music{ d'8. } } e'16 
+	d'16 c'16 b16 g16 a16 b16 c'16 b16 c'16 d'16 e'16 
+	d'16 e'16 fis'16 g'8 b8 c'8 a8 d'16 c'16 b16 a16 { 
 	\music{ g8. } } g16 f16 e16 f16 g16 a16 g16 a16 b16 
-	'c2 b4 'c8 'd8 'e8 'f8. { \music{ 'f16 } \music{ 
-	'g16 } } 'e8 'a8 'd8 'g8. 'a16 'g16 'f16 'e8 'a8. 
-	'b16 'a16 'g16 'f2 'e8. 'fis16 'g2 'fis4 'g16 'f16 
-	'e16 'd16 'c16 'd16 'c16 b16 a16 'c16 b16 a16 'c16 
-	a16 gis8 'e8 'd8 'c16 b16 a16 gis16 a16 b16 'c16 
-	fis16 gis16 a16 b8 a16 b16 'c8 'f8 'e8 'd4 'c16 b16 
-	{ \music{ 'c16 } } { \music{ b16 } } { \music{ b16 
-	b16 } \music{ 'c16 'c16 } \music{ b16 } \music{ 
-	'c16 'c16 } } { } { \music{ b16 } } { \music{ a16 } 
-	} a4 g8 a8 b8 'c8. { \music{ 'd16 } } { \music{ 
-	'c16 } } { \music{ b8 } } 'c8 'd8 'e8 'f8. { \music{
-	 'g16 } } { \music{ 'f16 } } { \music{ 'e8 } } 'a8 
-	'd8 'g8. 'a16 'g16 'f16 'e8 'a8 'd8 'ais8 'a8 'g16 
-	'f16 'g16 'f16 'g16 'e16 'f16 { \music{ 'g16 } } { 
-	\music{ 'g16 } } { \music{ 'a16 } } { \music{ 'g16 }
-	 } { } { } { \music{ 'f16 } } { \music{ 'g16 } } { 
-	\music{ 'a16 } } 'cis16 'd16 'g16 { \music{ 'f16 } 
-	} { \music{ 'e16 } } { \music{ 'f16 } } { \music{ 
-	'e16 } } { } { \music{ 'f16 } } { } { } { } { 
-	\music{ 'e8 } } { } 'd16 'd8 g8 a8 b8 'c8 'd16 { 
-	\music{ 'c16 } } { \music{ b8 } } 'e8 a8 { \music{ 
-	'd8. } } 'e16 'd16 'c16 b16 'c16 'd16 'e16 'f16 
-	'g16 'a16 'g16 'f16 'e16 'd16 'c16 { \music{ 'c16 } 
-	} { \music{ b16 } } { \music{ 'c16 } } { } { } { 
-	\music{ b8. } } 'c8 'd8 g8 { \music{ 'c4 } } b8 'c4 
-	b8 ais8 a8 { \music{ 'd4 } } 'c8 'd8 'e8 'f4 'a16 { 
-	\music{ 'g16 } } 'f16 'e16 { \music{ 'f16 } } { 
-	\music{ 'e16 } } 'd16 'c2 g16 { \music{ a16 } } b16 
-	'c16 'd16 'e16 { \music{ 'f8. } } { \music{ 'd16 } 
-	\music{ 'c16 'e16 } } 'f16 { \music{ 'g16 } } { 
-	\music{ 'a8. } } 'b16 ''c2 
-$} % track1
+	c'2 b4 c'8 d'8 e'8 f'8. { \music{ f'16 } \music{ 
+	g'16 } } e'8 a'8 d'8 g'8. a'16 g'16 f'16 e'8 a'8. 
+	b'16 a'16 g'16 f'2 e'8. fis'16 g'2 fis'4 g'16 f'16 
+	e'16 d'16 c'16 d'16 c'16 b16 a16 c'16 b16 a16 c'16 
+	a16 gis8 e'8 d'8 c'16 b16 a16 gis16 a16 b16 c'16 
+	fis16 gis16 a16 b8 a16 b16 c'8 f'8 e'8 d'4 c'16 b16 
+	{ \music{ c'16 } } { \music{ b16 } } { \music{ b16 
+	b16 } \music{ c'16 c'16 } \music{ b16 } \music{ 
+	c'16 c'16 } } { } { \music{ b16 } } { \music{ a16 } 
+	} a4 g8 a8 b8 c'8. { \music{ d'16 } } { \music{ 
+	c'16 } } { \music{ b8 } } c'8 d'8 e'8 f'8. { \music{
+	 g'16 } } { \music{ f'16 } } { \music{ e'8 } } a'8 
+	d'8 g'8. a'16 g'16 f'16 e'8 a'8 d'8 ais'8 a'8 g'16 
+	f'16 g'16 f'16 g'16 e'16 f'16 { \music{ g'16 } } { 
+	\music{ g'16 } } { \music{ a'16 } } { \music{ g'16 }
+	 } { } { } { \music{ f'16 } } { \music{ g'16 } } { 
+	\music{ a'16 } } cis'16 d'16 g'16 { \music{ f'16 } 
+	} { \music{ e'16 } } { \music{ f'16 } } { \music{ 
+	e'16 } } { } { \music{ f'16 } } { } { } { } { 
+	\music{ e'8 } } { } d'16 d'8 g8 a8 b8 c'8 d'16 { 
+	\music{ c'16 } } { \music{ b8 } } e'8 a8 { \music{ 
+	d'8. } } e'16 d'16 c'16 b16 c'16 d'16 e'16 f'16 
+	g'16 a'16 g'16 f'16 e'16 d'16 c'16 { \music{ c'16 } 
+	} { \music{ b16 } } { \music{ c'16 } } { } { } { 
+	\music{ b8. } } c'8 d'8 g8 { \music{ c'4 } } b8 c'4 
+	b8 ais8 a8 { \music{ d'4 } } c'8 d'8 e'8 f'4 a'16 { 
+	\music{ g'16 } } f'16 e'16 { \music{ f'16 } } { 
+	\music{ e'16 } } d'16 c'2 g16 { \music{ a16 } } b16 
+	c'16 d'16 e'16 { \music{ f'8. } } { \music{ d'16 } 
+	\music{ c'16 e'16 } } f'16 { \music{ g'16 } } { 
+	\music{ a'8. } } b'16 c''2 
+} % track1
 
-track2 = music { $
-	% midi copyright:
+track2 = \music { 
+	% \midi copyright:
 	% instrument:
 	c8 d8 e8 f8. { \music{ g16 } } { \music{ f16 } } { 
 	\music{ e8 } } a8 d8 { \music{ g8. } } a16 g16 f16 
 	e16 f16 e16 d16 c16 d16 c16 `b16 `a8 fis8 { \music{ 
 	g4. } } f16 e16 f8 d8 g8 f8 e8 d8 g4 f16 e16 f4 f16 
 	e8 d4 c8 f8 g16 f16 e16 f8 d8 g4.. g8 a8 b8 { 
-	\music{ 'c8. } } { \music{ 'd16 } } { \music{ 'c16 }
-	 } { \music{ b8 } } 'e8 a8 { \music{ 'd8. } } 'e16 
-	'd16 'c16 b8 d8 e8 fis8 { \music{ g8. } } { \music{ 
+	\music{ c'8. } } { \music{ d'16 } } { \music{ c'16 }
+	 } { \music{ b8 } } e'8 a8 { \music{ d'8. } } e'16 
+	d'16 c'16 b8 d8 e8 fis8 { \music{ g8. } } { \music{ 
 	a16 } } { \music{ g16 } } { \music{ f8 } } b8 e8 
 	a8. b16 a16 gis16 fis8 f8 e8 d8. e16 fis16 gis16 
 	a16 gis16 a16 b16 gis16 fis16 gis16 a16 b8 c8 d8 e8 
 	{ \music{ f8. } } { \music{ g16 } } { \music{ f16 } 
 	} { \music{ e8 } } a8 d8 g8. a16 g16 f16 e16 e16 
 	fis16 g4 fis8 gis8 { \music{ a4 } } g8 a8 b8 { 
-	\music{ 'c8. } } { \music{ 'd16 } } { \music{ 'c16 }
-	 } { \music{ b8 } } 'e8 a8 'd8. 'e16 'd16 'c16 b8 
-	'g8 'cis8 'd8 'e8 'cis8 'd8 'e8 a8 e8 fis8 g8 { 
+	\music{ c'8. } } { \music{ d'16 } } { \music{ c'16 }
+	 } { \music{ b8 } } e'8 a8 d'8. e'16 d'16 c'16 b8 
+	g'8 cis'8 d'8 e'8 cis'8 d'8 e'8 a8 e8 fis8 g8 { 
 	\music{ a8. } } { \music{ b16 } } { \music{ a16 } } 
-	{ \music{ g8 } } 'c8 fis8 { \music{ b8. } } 'c16 
+	{ \music{ g8 } } c'8 fis8 { \music{ b8. } } c'16 
 	b16 a16 g16 fis16 e16 d16 e4 d4 a16 g16 f16 e16 g16 
-	f16 a16 g4 a16 ais8 { \music{ 'c4 } } 'd8 g8 { 
+	f16 a16 g4 a16 ais8 { \music{ c'4 } } d'8 g8 { 
 	\music{ g4. } } f4 e8 d4 e16 a4 g4 f8 g8 a8 { 
-	\music{ ais8. } } { \music{ 'c16 } } { \music{ 
-	ais16 } } { \music{ a8 } } 'd8 g8 { \music{ 'c8. } 
-	} 'd16 'c16 ais16 a16 ais16 a16 g16 f16 g16 f16 e16 
-	g16 a4 'f16 'd8 { \music{ 'e2 } \music{ 'g2 } } 
-$} % track2
+	\music{ ais8. } } { \music{ c'16 } } { \music{ 
+	ais16 } } { \music{ a8 } } d'8 g8 { \music{ c'8. } 
+	} d'16 c'16 ais16 a16 ais16 a16 g16 f16 g16 f16 e16 
+	g16 a4 f'16 d'8 { \music{ e'2 } \music{ g'2 } } 
+} % track2
 
-track3 = music { $
-	% midi copyright:
+track3 = \music { 
+	% \midi copyright:
 	% instrument:
 	`g8 `a8 `b8 c8. { \music{ d16 } } { \music{ c16 } } 
 	{ \music{ `b8 } } e8 `a8 { \music{ d8. } } e16 d16 
@@ -106,10 +106,10 @@ track3 = music { $
 	`d8 { \music{ `g8. } } `a16 `g16 `f16 `e16 `d16 
 	`e16 `f16 `g16 `a16 `ais16 `g16 `a16 `e16 `f16 `g16 
 	`a16 `b16 c16 { \music{ `a16 } \music{ d2 } } c1 
-$} % track3
+} % track3
 
-track4 = music { $
-	% midi copyright:
+track4 = \music { 
+	% \midi copyright:
 	% instrument:
 	`c8 `d8 `e8 `f8. { \music{ `g16 } } { \music{ `f16 }
 	 } { \music{ `e8 } } `a8 `d8 { \music{ `g8. } } 
@@ -121,27 +121,24 @@ track4 = music { $
 	`e16 `d16 `c16 { \music{ ``b8 } } `e4 `d8 `c8 `f4 
 	`e4 `d4 `e8 `f8 `e16 `d16 `e4 ``a4 ``g8 ``a8 ``b8 
 	`c8. { \music{ `d16 } } { \music{ `c16 } } { \music{
-	 ``b8 } } `e8 ``a8 `d8. `e16 `d16 `c16 ``b8 ``ais8 
+	 ``b8 } } `e8 ``a8 `d8. `e16 `d16 `c16 ``b8 ai``s8 
 	``a8 ``g8 ``a8 `fis8 `g8 `e8 `d4 `e8 `f8 `g8. { 
 	\music{ `a16 } } { \music{ `g16 } } { \music{ `f8 } 
 	} `ais8 `e8 `a8. `b16 { \music{ `a16 } } `g16 `f16 
 	`e16 `f16 `d16 `g8 `a8 `d4.. `e16 `d16 `c16 ``b16 
-	``a16 ``g16 ``fis16 ``e8 `e8 `fis8 `g4 `a16 `g16 
+	``a16 ``g16 fi``s16 ``e8 `e8 `fis8 `g4 `a16 `g16 
 	`fis8 `d8 `g1 `a4 `b8 c8 `f16 `a16 `g16 `f16 `e16 
 	`d16 `c16 ``b16 `c16 `d16 `e16 `f16 `g8 ``g8 `b2 
-$} % track4
+} % track4
 
 score {
-	staff { melodic music { track0 } }
-	staff { melodic music { track1 } }
-	staff { melodic music { track2 } }
-	staff { melodic music { track3 } }
-	staff { melodic music { track4 } }
+	\staff { \melodic \music { track0 } }
+	\staff { \melodic \music { track1 } }
+	\staff { \melodic \music { track2 } }
+	\staff { \melodic \music { track3 } }
+	\staff { \melodic \music { track4 } }
 
-	commands {
-		meter { 4*4 } 
-	}
-	midi {
-		tempo 4:60 
+	\midi {
+		\tempo 4:60 
 	}
 }
diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 645c1f9d4b..d26a7431bf 100644
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -1,18 +1,18 @@
 % "Ah,  vous dirais-je, maman" (Mozart, KV 265)
 % 
-% bare bones version. (written down from memory :-)
+% \bare bones version. (written down from memory :-)
 % for lyrics, see twinkle.ly
 
-% the % is a comment.
+% the % is a co\mment.
 %
 % copyright: None
 %
-% declare music (which will be in *one* staff ) for the lead voice
+% declare \music (which will be in *one* \staff ) for the lead \voice
 
-melodie = music {
-	$ 			% switch Lilypond in note-mode
+melodie = \music {
+	 			% switch Lilypond in note-mode
 	\clef\violin
-	\octave {} 		% set the default octave
+	\octave {} 		% set the default \octave
 	% the default note duratino is 4
 	%%% theme
 	c c |			% the '|' checks if there is a new measure here.
@@ -24,24 +24,24 @@ melodie = music {
 	g g|	f f|	e e| 	d d|	g g|	f f|	e e| 	d d|
  	%%% var 1
 	  c r8 c8		% r8 means an 8th rest.
-		  (|		% start a slur
-				% NOTE: the slurstart should be directly after the note
+		  (|		% \start a slur
+				% NOTE: the slur\start should be directly after the note
 			) 	% end a slur.
 			  g r8 g8 (|	) a r8 a8 (|	) g r4 
 	  f r8 f8 (|	) e4 r8 e8 (	|) d4 r8 d8 (|	) c4 r4 
-$}
+}
 
 				% more of this.
 begeleiding =
-%	$\clef bass		% bass-clef
-%	\music { 		% as you can see, the $ sign obliges 
-				% you to precede keyword by a backslash: \
-	music { $
+%	\clef bass		% bass-\clef
+%	\music { 		% as you can see, the  sign obliges 
+				% you to precede \keyword by a backslash: \
+	\music { 
 	\clef "bass"
-	\octave { ` } 		% default octave: 1 below the first octave.
+	\octave { ` } 		% default \octave: 1 below the first \octave.
 
 	%%% theme
-	`c			% ` means one octave lower.
+	`c			% ` means one \octave lower.
 				% Similarly: ' means one higher.
 	   c	e c	f c	e c	d `b	c `a	`f `g	`c2
 	\octave { ` }
@@ -49,31 +49,30 @@ begeleiding =
 	%%%% var 1
 	r8 e8() c  	r8 e8() c  	r8 f8()c 	r8 e8()c
 	r8 d8()`b 	r8 c8()`a 	r8 `a8()`f 	r8 `e8()`c
-}$
+}
 
 
-% create a staff named bstaf
-bstaf = staff {
-	melodic
-	music { begeleiding }	% use the declared music
+% create a \staff named bstaf
+bstaf = \staff {
+	\melodic
+	\music { begeleiding }	% use the declared \music
+	\music { \meter {2/4 }  }
 	}
 
 % another one
-vstaf = staff {
-	melodic
-		music { melodie }
-				% default clef is violin clef
+vstaf = \staff {
+	\melodic
+		\music { melodie }
+				% default \clef is violin \clef
+		\music { \meter {2/4 } }
 	}
 
 
-score {
-	staff { vstaf }
-	staff { bstaf }
-	paper {
-		unitspace 2.5cm	% a whole note takes 2.5 cm ideally.
-	}
-	commands {
-		meter {2* 4} 	% a 2/4 meter.
+\score {
+	\staff { vstaf }
+	\staff { bstaf }
+	\paper {
+		\unitspace 2.5\cm	% a whole note takes 2.5 \cm ideally.
 	}
 }
 
diff --git a/input/martien.ly b/input/martien.ly
index 86c737badc..56340bddab 100644
--- a/input/martien.ly
+++ b/input/martien.ly
@@ -9,7 +9,7 @@
 % quite alive at the time of writing; 
 % copyright by ml
 %
-% lilypond: src/stem.cc:42: void Stem::set_stemend(double): Assertion `(dir > 0 && se >= maxnote) || (se <= minnote && dir <0)' failed.
+% lilypond: src/\stem.cc:42: void Stem::set_\stemend(double): Assertion `(dir > 0 && se >= maxnote) || (se <= minnote && dir <0)' failed.
 % 
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
@@ -17,46 +17,51 @@
 % \barnumbering5
 % \barnumberstyle\boxed
 
+globalmusic= \music {
+		\meter {2/4}
+%		\key fis
+		\skip {56*2}
+%		\key bes es as
+		\skip {8*2}
+		\meter {6/8}
+		\skip{ 48*8}
+		\meter {2/4}
+		\skip {16*2}
+%		\key fis
+}
+
 include "mlalt.ly"
 include "mlvio1.ly"
 include "mlvio2.ly"
 include "mlcello.ly"
 
-score {
-	staff { 
-		melodic 
-		music { alto }
+\score {
+	\staff { 
+		\melodic 
+		\music { alto }
+		\music { globalmusic }
 	}
-	staff { 
-		melodic 
-		music { violin1 }
+	\staff { 
+		\melodic 
+		\music { violinI }
+		\music { globalmusic }
 	}
-	staff { 
-		melodic 
-		music { violin2 }
+	\staff { 
+		\melodic 
+		\music { violinII }
+		\music { globalmusic }
 	} 
-	staff { 
-		melodic 
-		music { cello }
+	\staff { 
+		\melodic 
+		\music { cello }
+		\music { globalmusic }
 	} 
-	commands {
-		meter {2*4}
-%		key $fis$
-		skip {56*2}
-%		key $bes es as$
-		skip {8*2}
-		meter {6*8}
-		skip{ 48*8}
-		meter {2*4}
-		skip {16*2}
-%		key $fis$
-	}
-	paper {
-		unitspace 24mm
-		width 195mm
-		output "martien.out"
+	\paper {
+		\unitspace 24\mm
+		\width 195\mm
+		\output "martien.out"
 	}
-	midi { 
-		tempo 4:80
+	\midi { 
+		\tempo 4:80
 	}
 }
diff --git a/input/midi.ly b/input/midi.ly
index 38e5073778..4382ed3bf2 100644
--- a/input/midi.ly
+++ b/input/midi.ly
@@ -1,40 +1,40 @@
-% midi.ly
-% test source for lilypond-s midi output
+% \midi.ly
+% test source for lilypond-s \midi \output
 
-melodie = music {
-	$\clef\violin
+melodie = \music {
+	\clef\violin
 	c c | g g | a a | g2 
 	f f | e e | d d8.( e16 | )c2 | % :|
-	$
+	
 }
 
-begeleiding = music {
-	$
+begeleiding = \music {
+	
 	\clef \bass
 	\octave{`}
-	c 'c | 'e 'c | 'f 'c | 'e 'c 
-	'd b | 'c a | f g | c2 | 
-	$
+	c c' | e' c' | f' c' | e' c' 
+	d' b | c' a | f g | c2 | 
+	
 }
 
-mstaf = staff {
-	melodic
-	music { melodie }
+mstaf = \staff {
+	\melodic
+	\music { melodie }
 }
 
-bass_staf = staff {
-	melodic	
-	music { begeleiding }
+bass_staf = \staff {
+	\melodic	
+	\music { begeleiding }
 }
 
 score {
-	staff { mstaf }
-	staff { bass_staf }
-	commands {
-		meter { 2 * 4}
+	\staff { mstaf }
+	\staff { bass_staf }
+	\co\mmands {
+		\meter { 2 * 4}
 	}
-	midi {
-		tempo 4:120
+	\midi {
+		\tempo 4:120
 	}
 }
 
diff --git a/input/mlalt.ly b/input/mlalt.ly
index cbe46e0f23..50563fef84 100644
--- a/input/mlalt.ly
+++ b/input/mlalt.ly
@@ -11,8 +11,8 @@
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
 %
-alto = music { 
-	$
+alto = \music { 
+	
 	\duration{16}
 	\clef\alto
 	\octave{}
@@ -84,7 +84,7 @@ alto = music {
 %30
 	[ a8 `a8 ] a4 |
 %31
-	[ b8 'cis8 ] [ 'd8 a8 ] |
+	[ b8 cis'8 ] [ d'8 a8 ] |
 %32
 	[ g e cis `a ] d4 |
 %variant a
@@ -210,5 +210,5 @@ alto = music {
 	\textstyle "roman"
 %\scoreverb{\mulooseness=1}
 %	\key\G ||
-	$
+	
 }
diff --git a/input/mlcello.ly b/input/mlcello.ly
index 558fc1fb15..c513a366ea 100644
--- a/input/mlcello.ly
+++ b/input/mlcello.ly
@@ -11,8 +11,8 @@
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
 %
-cello = music { 
-	$
+cello = \music { 
+	
 \clef"bass"	\octave{`}
 	\duration{4}
 	\key{fis}
@@ -41,14 +41,14 @@ cello = music {
 %%12
 	) d g |
 %%13
-	[ d8 'd8 ] g |
+	[ d8 d'8 ] g |
 %%14=10
-	[ d8 'd8 ] g |
+	[ d8 d'8 ] g |
 %%15
 	[ c8 e8 ] [ g8 `g8 ] |
 %%16
 	\textstyle "italic"
-	[ d8 'c8 ] b_"fine"
+	[ d8 c'8 ] b_"fine"
 	\textstyle "roman" |
 % \newline
 %%17=1
@@ -92,7 +92,7 @@ cello = music {
 %%34
 	[ `g8 `g `g ] g4 |
 %%35
-	[ c8 c c ] [ c8 'c 'c ] |
+	[ c8 c c ] [ c8 c' c' ] |
 %%36
 	g4 b4 |
 %%37
@@ -178,7 +178,7 @@ cello = music {
 %%71
 	g2.  |
 %%72
-	'c r4 r4. |
+	c' r4 r4. |
 %%73
 % \meter{2/4} ||
 	g r g r |
@@ -216,5 +216,5 @@ cello = music {
 	d_"dacapo" \key{fis} |
 	\textstyle "roman"
 % \key\`g ||
-	$
+	
 }
diff --git a/input/mlvio2.ly b/input/mlvio2.ly
index c3ed9bb999..74940775cb 100644
--- a/input/mlvio2.ly
+++ b/input/mlvio2.ly
@@ -11,8 +11,8 @@
 % The purpose of this file is to demonstrate features of LilyPond;
 % respect the copyright.
 %
-violin2 = music { 
-	$
+violinII = \music { 
+	
 \clef "violin"	\octave{}
 	\duration{4}
 	\key{fis}
@@ -172,7 +172,7 @@ violin2 = music {
 %69
 	es2. |
 %70
-	[ c es g ] 'c4.  |
+	[ c es g ] c'4.  |
 %71
 	b4 g4 d4 |
 %72
@@ -214,5 +214,5 @@ violin2 = music {
 	fis_"dacapo" \key{fis}|
 	\textstyle "roman"
 % \key\G ||
-	$
+	
 }
diff --git a/input/plet.ly b/input/plet.ly
index 752a6bade6..d309296dda 100644
--- a/input/plet.ly
+++ b/input/plet.ly
@@ -1,18 +1,18 @@
 
-melanie = music {
-	$
+melanie = \music {
+	
 	\duration{8}
-	[ c d ] { [ d 'd } { c 'c ] } |
+	[ c d ] { [ d d' } { c c' ] } |
 	[ c d ] [ e { d g } c ]2/3 |
-	[ c d ] [ c16 d16 'e16 'e16 d16 c16 ]4/6 |
+	[ c d ] [ c16 d16 e'16 e'16 d16 c16 ]4/6 |
 	[ c d e e d c ]4/6 |
 	[c d ] { \music{ [ c d e ]2/3 } \music{ [ f g a ]2/3 } } |
 	[ c d ] [ d c ] |
-        $
+        
 }
 
-michelle = music {
-	$
+michelle = \music {
+	
 	\duration{8}
 	[ c c c c ] |
 	[ c c c c ] |
@@ -20,10 +20,10 @@ michelle = music {
 	[ c c c c ] |
 	[ c c c c ] |
 	[ c c c c ] |
-	$
+	
 }
 
-mireille = music {
+mireille = \music {
 	@
 	\duration{8}
 	o o o o |
@@ -36,10 +36,10 @@ mireille = music {
 }
 
 score {
-	staff { lyric music { mireille } }
-	staff { melodic music { melanie } }
-	staff { melodic music { michelle } }
-	commands{ 
-		meter {2*4}
+	\staff { lyric \music { mireille } }
+	\staff { \melodic \music { melanie } }
+	\staff { \melodic \music { michelle } }
+	\co\mmands{ 
+		\meter {2*4}
 	}
 }
diff --git a/input/pre1.midi.ly b/input/pre1.midi.ly
index 69ee6feeaa..3945d68be8 100644
--- a/input/pre1.midi.ly
+++ b/input/pre1.midi.ly
@@ -1,42 +1,42 @@
 % Creator: This is mi2mu 0.0.11.2 #14/FlowerLib 1.1.7 #1 of Mar 12 1997 02:05:36
 % Automatically generated, at Wed Mar 12 02:09:07 1997
-% from input file: pre1.midi
+% from input file: pre1.\midi
 % jcn: using option -n
 
-track0 = music { $
-	% midi copyright:
+track0 = \music { 
+	% \midi copyright:
 	% instrument:
 	{ } { } { } { } { } { } { } { } 
-$} % track0
+} % track0
 
-track1 = music { $
-	% midi copyright:
+track1 = \music { 
+	% \midi copyright:
 	% instrument:
-	{ \music{ g16 'c16 'e16 g16 'c16 'e16 } } { \music{ 
-	g16 'c16 'e16 g16 'c16 'e16 } } { \music{ a16 'd16 
-	'f16 a16 'd16 'f16 } } { \music{ a16 'd16 'f16 a16 
-	'd16 'f16 } } { \music{ g16 'd16 'f16 g16 'd16 'f16 
-	} } { \music{ g16 'd16 'f16 g16 'd16 'f16 } } { 
-	\music{ g16 'c16 'e16 g16 'c16 'e16 } } { \music{ 
-	g16 'c16 'e16 g16 'c16 'e16 } } { \music{ a16 'e16 
-	'a16 a16 'e16 'a16 } } { \music{ a16 'e16 'a16 a16 
-	'e16 'a16 } } { \music{ fis16 a16 'd16 fis16 a16 
-	'd16 } } { \music{ fis16 a16 'd16 fis16 a16 'd16 } 
-	} { \music{ g16 'd16 'g16 g16 'd16 'g16 } } { 
-	\music{ g16 'd16 'g16 g16 'd16 'g16 } } { \music{ 
-	e16 g16 'c16 e16 g16 'c16 } } { \music{ e16 g16 
-	'c16 e16 g16 'c16 } } { \music{ e16 g16 'c16 e16 
-	g16 'c16 } } { \music{ e16 g16 'c16 e16 g16 'c16 } 
-	} { \music{ d16 fis16 'c16 d16 fis16 'c16 } } { 
-	\music{ d16 fis16 'c16 d16 fis16 'c16 } } { \music{ 
+	{ \music{ g16 c'16 e'16 g16 c'16 e'16 } } { \music{ 
+	g16 c'16 e'16 g16 c'16 e'16 } } { \music{ a16 d'16 
+	f'16 a16 d'16 f'16 } } { \music{ a16 d'16 f'16 a16 
+	d'16 f'16 } } { \music{ g16 d'16 f'16 g16 d'16 f'16 
+	} } { \music{ g16 d'16 f'16 g16 d'16 f'16 } } { 
+	\music{ g16 c'16 e'16 g16 c'16 e'16 } } { \music{ 
+	g16 c'16 e'16 g16 c'16 e'16 } } { \music{ a16 e'16 
+	a'16 a16 e'16 a'16 } } { \music{ a16 e'16 a'16 a16 
+	e'16 a'16 } } { \music{ fis16 a16 d'16 fis16 a16 
+	d'16 } } { \music{ fis16 a16 d'16 fis16 a16 d'16 } 
+	} { \music{ g16 d'16 g'16 g16 d'16 g'16 } } { 
+	\music{ g16 d'16 g'16 g16 d'16 g'16 } } { \music{ 
+	e16 g16 c'16 e16 g16 c'16 } } { \music{ e16 g16 
+	c'16 e16 g16 c'16 } } { \music{ e16 g16 c'16 e16 
+	g16 c'16 } } { \music{ e16 g16 c'16 e16 g16 c'16 } 
+	} { \music{ d16 fis16 c'16 d16 fis16 c'16 } } { 
+	\music{ d16 fis16 c'16 d16 fis16 c'16 } } { \music{ 
 	d16 g16 b16 d16 g16 b16 } } { \music{ d16 g16 b16 
-	d16 g16 b16 } } { \music{ e16 g16 'cis16 e16 g16 
-	'cis16 } } { \music{ e16 g16 'cis16 e16 g16 'cis16 }
-	 } { \music{ d16 a16 'd16 d16 a16 'd16 } } { \music{
-	 d16 a16 'd16 d16 a16 'd16 } } { \music{ d16 f16 
+	d16 g16 b16 } } { \music{ e16 g16 cis'16 e16 g16 
+	cis'16 } } { \music{ e16 g16 cis'16 e16 g16 cis'16 }
+	 } { \music{ d16 a16 d'16 d16 a16 d'16 } } { \music{
+	 d16 a16 d'16 d16 a16 d'16 } } { \music{ d16 f16 
 	b16 d16 f16 b16 } } { \music{ d16 f16 b16 d16 f16 
-	b16 } } { \music{ c16 g16 'c16 c16 g16 'c16 } } { 
-	\music{ c16 g16 'c16 c16 g16 'c16 } } { \music{ 
+	b16 } } { \music{ c16 g16 c'16 c16 g16 c'16 } } { 
+	\music{ c16 g16 c'16 c16 g16 c'16 } } { \music{ 
 	`a16 c16 f16 `a16 c16 f16 } } { \music{ `a16 c16 
 	f16 `a16 c16 f16 } } { \music{ `a16 c16 f16 `a16 
 	c16 f16 } } { \music{ `a16 c16 f16 `a16 c16 f16 } } 
@@ -66,15 +66,15 @@ track1 = music { $
 	 } { \music{ `g16 `ais16 e16 `g16 `ais16 e16 } } { 
 	\music{ `g16 `ais16 e16 `g16 `ais16 e16 } } { 
 	\music{ `f16 `a16 c16 f16 c16 `a16 c16 `a16 `f16 
-	`a16 `f16 `d16 `f16 `d16 } } { \music{ g16 b16 'd16 
-	'f16 'd16 b16 'd16 b16 g16 b16 d16 f16 e64 } } { 
+	`a16 `f16 `d16 `f16 `d16 } } { \music{ g16 b16 d'16 
+	f'16 d'16 b16 d'16 b16 g16 b16 d16 f16 e64 } } { 
 	\music{ f64 } } { } { \music{ e32 } } { \music{ d16 
-	} } { \music{ 'c1 } \music{ g1 } \music{ e1 } } 
-$} % track1
+	} } { \music{ c'1 } \music{ g1 } \music{ e1 } } 
+} % track1
 
-% jcn: substituted some "2" durations to "4."
-track2 = music { $
-	% midi copyright:
+% jcn: substituted some "2" \durations to "4."
+track2 = \music { 
+	% \midi copyright:
 	% instrument:
 	{ \music{ e4. } } { \music{ e4. } } { \music{ d4. } 
 	} { \music{ d4. } } { \music{ d4. } } { \music{ d4. 
@@ -93,9 +93,9 @@ track2 = music { $
 	`e4. } } { \music{ `g4. } } { \music{ `c4. } } { } { 
 	} { \music{ `g4. } } { } { \music{ ``f4. } } { 
 	\music{ `f4. } } { \music{ ``f4. } } { \music{ `f4. }
-	 } { \music{ ``fis4. } } { \music{ ``fis4. } \music{ 
-	`c4. } } { } { \music{ `c4. } } { \music{ ``gis4. } } 
-	{ \music{ ``gis4. } \music{ `f4. } } { } { \music{ 
+	 } { \music{ fi``s4. } } { \music{ fi``s4. } \music{ 
+	`c4. } } { } { \music{ `c4. } } { \music{ gi``s4. } } 
+	{ \music{ gi``s4. } \music{ `f4. } } { } { \music{ 
 	`f4. } } { \music{ ``g4. } } { \music{ ``g4. } \music{
 	 `f4. } } { } { \music{ `f4. } } { \music{ ``g4. } } 
 	{ \music{ ``g4. } \music{ `e4. } } { } { \music{ ``g4. 
@@ -112,17 +112,17 @@ track2 = music { $
 	``c4. } } { \music{ `c4. } } { \music{ ``c1 } } { 
 	\music{ `c1 } } { \music{ ``c1 } \music{ ``b1 } } { 
 	} { } { } { \music{ ``c1 } \music{ `c1 } } 
-$} % track4.
+} % track4.
 
 score {
-	staff { melodic music { track0 } }
-	staff { melodic music { track1 } }
-	staff { melodic music { track2 } }
+	\staff { \melodic \music { track0 } }
+	\staff { \melodic \music { track1 } }
+	\staff { \melodic \music { track2 } }
 
-	commands {
-		meter { 4*4 } 
+	\co\mmands {
+		\meter { 4*4 } 
 	}
-	midi {
-		tempo 4:60 
+	\midi {
+		\tempo 4:60 
 	}
 }
diff --git a/input/twinkle.ly b/input/twinkle.ly
index 035854e846..14f6030cc7 100644
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -4,61 +4,59 @@
 % 
 % Copyright: none
 
-melodie = music {
-	$\clef\violin
+melodie = \music {
+	\clef\violin
 	c c | g g | a a | g g |
 	f f | e e | d d8.( e16 | )c2 | % :|
 
 	g g | f f | e e | d d |
-%	g g | f f | e( [f0*32 e0*32 d0*32] e8. f16 | e )d | c c | 
 	g g | f f | e( e8. f16 | e )d |
 
 	c c | g g | a a | g g |
 	f f | e e | d d8.( e16 | )c2 % :|
 	\bar ":|"
-	$
+	
 }
 
-begeleiding = music {
-	$\clef \bass
+begeleiding = \music {
+	\clef \bass
 	\octave{`}
-	c 'c | 'e 'c | 'f 'c | 'e 'c | 
-	'd b | 'c a | f g | c2 | 
+	c c' | e' c' | f' c' | e' c' | 
+	d' b | c' a | f g | c2 | 
 
-	'e g | d g | 'c g | b g | 
-%	'e g | 'd g | 'c 'c8.( 'd16 | \voice{ 'c )b } \voice{ g2 } |
-	'e g | 'd g | 'c 'c8.( 'd16 | 'c )b |
+	e' g | d g | c' g | b g | 
+	e' g | d' g | c' c'8.( d'16 | c' )b |
 
-	c 'c | 'e 'c | 'f 'c | 'e 'c | 
-	'd b | 'c a | f g | c2 
+	c c' | e' c' | f' c' | e' c' | 
+	d' b | c' a | f g | c2 
 	\bar ":|"
-	$
+	
 }
-
-tekst = music { 
-	@ 
+globalmusic=\music{
+		\meter {2 / 4}
+		\skip {24*2}
+%		\bar "||"
+	}
+tekst = \lyrics { 
  	Al- tijd is Kort- jak- je ziek,2
-	midden in_de week maar 's_zon- dags niet.2
-	's_Zon- dags gaat ze naar de kerk,2
+	midden in_de week maar s'_zon- dags niet.2
+	s'_Zon- dags gaat ze naar de kerk,2
 	met een boek vol zil- ver werk.2
 	Al- tijd is Kort- jak- je ziek,2
-	midden in_de week maar 's_zon- dags niet.2
-	@
+	midden in_de week maar s'_zon- dags niet.2
 }
 
-he_gedraagje_tekst = music { 
-	@ 
+hegedraagjetekst = \lyrics { 
  	Al- tijd zuigt Bill Gates mijn piek,2
 	"\TeX" is slecht- ser dan mu- ziek.2
-	's_Zon- dags gaat het door een raam,2
+	s'_Zon- dags gaat het door een raam,2
 	Weet dat ik me er- voor schaam.2
  	Al- tijd zuigt Bill Gates mijn piek,2
 	"\TeX" is slecht- ser dan mu- ziek.2
-	@
 }
 
-texte = music { 
-	@ 
+texte = \lyrics { 
+	 
 	\textstyle "italic" 
  	Ah! vous dir- ai_- je ma man2
 	Ce qui cau- se mon tour- ment2
@@ -66,11 +64,11 @@ texte = music {
 	Comme un- e grand- e per- sonne2
 	Moi je dis que les bon- bons2
 	Val- ent mieux que la rai- son2
-	@
+	
 }
 
-text1 = music {
-	@
+textI = \lyrics {
+	
 	\textstyle "roman"
 	Twin- kle, twin- kle, lit- tle star,2
 	How I won- der what you are.2
@@ -78,11 +76,9 @@ text1 = music {
 	Like a dia- mond in the sky.2
 	Twin- kle, twin- kle, lit- tle star,2
 	How I won- der what you are!2
-	@
 }
 
-text2 = music {
-	@
+textII = \lyrics {
 	\textstyle "roman"
 	When the bla- zing sun is gone,2
 	When he no- thing shines up- on,2
@@ -90,11 +86,11 @@ text2 = music {
 	Twin- kle, twin- kle, all the night.2
 	Twin- kle, twin- kle, lit- tle star,2
 	How I won- der what you are!2
-	@
+	
 }
 
-text3 = music {
-	@
+textIII = \lyrics{
+	
 	\textstyle "roman"
 	Then the tra- veler in the dark2
 	Thanks you for your ti- ny spark;2
@@ -102,61 +98,63 @@ text3 = music {
 	If you did not twin- kle so.2
 	Twin- kle, twin- kle, lit- tle star,2
 	How I won- der what you are!2
-	@
+	
 }
 
-mstaf = staff {
-	melodic
-	music { melodie }
+mstaf = \staff {
+	\melodic
+	\music { melodie }
+	\music { globalmusic }
 }
 
-bass_staf = staff {
-	melodic	
-	music { begeleiding }
+bassstaf = \staff {
+	\melodic	
+	\music { begeleiding }
+	\music { globalmusic }
 }
 
 
-dutch_staf = staff {
+dutchstaf = \staff {
  	lyric 
-	music { tekst }
-	music {he_gedraagje_tekst}
+	\music { tekst }
+	\music {hegedraagjetekst}
+	\music { globalmusic }
 }
 
-french_staf = staff {
+frenchstaf = \staff {
  	lyric 
-	music { texte }
+	\music { texte }
+	\music { globalmusic }
 }
 
-english_staf = staff {
+englishstaf = \staff {
  	lyric 
-	music { text1 }
-	music { text2 }
-	music { text3 }
+	\music { textI }
+	\music { textII }
+	\music { textIII }
+	\music { globalmusic }
 }
 
-tstaf = staff { 
+tstaf = \staff { 
 	lyric 
-	music { tekst }
-	music { texte }
+	\music { tekst }
+	\music { texte }
+	\music { globalmusic }
 }
 
 
-score {
-	staff { mstaf }
-	staff { dutch_staf }
-	staff { french_staf }
-	staff { english_staf }
-	staff { bass_staf }
-	paper {
-		unitspace 2.5cm
-	}
-	commands {
-		meter {2 * 4}
-		skip {24*2}
-%		bar "||"
+\score {
+	\staff { mstaf }
+	\staff { dutchstaf }
+	\staff { frenchstaf }
+	\staff { englishstaf }
+	\staff { bassstaf }
+	\paper {
+		\unitspace 2.5\cm
 	}
-	midi { 
-		tempo 4:120 
+	
+	\midi { 
+		\tempo 4:120 
 	}
 }
 
diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index 32de885acf..921cdbb983 100644
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -1,26 +1,29 @@
 % JS Bach, Das Wohltemperirtes Clavier I, Fuga II (c-minor)
 %
-% a 7 bar fragment
+% a 7 \bar fragment
 %
 %	Public Domain -- typed by by HWN
 %
+global=\music{\meter {4/4}
+		\grouping {2*2}
+		\key {bes es as}}
 
-dux = music { $
+dux = \music { 
 	\clef \violin
 	\duration { \last }
 	
 	 r8-"dux" 	\stem{-1}
-	['c16 b] ['c8 g] [as 'c16 b] ['c8 'd] |
-	[g 'c16 b] ['c8 'd] [f16 g] as4 [g16 f]	|
-	[es 'c b a] [ g f es d] [c8 'es 'd 'c] |
-	[bes a bes 'c] [fis g a fis] |
+	[c'16 b] [c'8 g] [as c'16 b] [c'8 d'] |
+	[g c'16 b] [c'8 d'] [f16 g] as4 [g16 f]	|
+	[es c' b a] [ g f es d] [c8 es' d' c'] |
+	[bes a bes c'] [fis g a fis] |
 	g4 r16 [c d es] [f g as8(] [)as16 d es f ]|
-	[g a bes8(] [)bes16 es f g ] [as g f es] [d8 'c16 b]|
-	'c4 r4 r8 ['f 'es 'd] 
+	[g a bes8(] [)bes16 es f g ] [as g f es] [d8 c'16 b]|
+	c'4 r4 r8 [f' es' d'] 
 	r8 [as g f] [g f16 es] [f8 d] | 
-$}
+}
 
-comes = music { $
+comes = \music { 
 	\octave {'}
 	r1	\stem{1}
  |
@@ -32,9 +35,9 @@ comes = music { $
 	[) f8 es16 d] [c16 `bes `as `g] [`f8 as g f] 
 	[es d es f] [`b c d `b] |
 	
-$}
+}
 
-bassdux = music { $
+bassdux = \music { 
 	\clef \bass
 	\octave { }
 	r1 |
@@ -45,31 +48,26 @@ bassdux = music { $
 	r1 |
 	r8 [c16 B] [c8 G] [As c16 B] [c8 d] |
 	[G c16 B] [c8 d] [F16 G] As4 [G16 F] | 
-$}
+}
 
-trebstaf = staff { melodic
-		% every "music {} " in a staff has its own "voicegroup"
-		music { dux }
-		music { comes }
-		
+trebstaf = \staff { \melodic
+		% every "\music {} " in a \staff has its own "\voicegroup"
+		\music { dux }
+		\music { comes }
+	\music{global}	
 	}
 
-basstaf = staff { melodic
-	music { bassdux }
+basstaf = \staff { \melodic
+	\music { bassdux }
+	\music{global}	
 }
-
-score {
-	staff { trebstaf }
-	staff { basstaf }
+\score {
+	\staff { trebstaf }
+	\staff { basstaf }
 	
-	commands {
-		meter {4*4}
-		grouping {2*2}
-		key {$bes es as$}
-	}
-	paper {}
-	midi {
-		tempo 4:90
+	\paper {}
+	\midi {
+		\tempo 4:90
 	}
 }