From c9c0c0fb8eb3e8c1025352962ea1163c0d83bafd Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:36:41 +0000
Subject: [PATCH] lilypond-0.0.45

---
 input/scsii-menuetto.ly | 26 +++++++++------------
 input/wohltemperirt.ly  | 50 ++++++++++++++++++-----------------------
 2 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index f53ff15fef..85c6a8e1e1 100644
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -12,25 +12,23 @@
 % (there is an accompanying LaTeX file, scsii-menuetto.tex)
 %
 
+%% Stuff from MPP version
 % \lefttitle{Menuetto}
 % \tempo{Moderato}
 % \metron{4=120}
 %
-% \meter{3/4}
 % \key\F		% \key is F ( f-major )
-% \clef\alto		% use alto \clef
-% \duration8		% default \duration is eight' note
 %
-% \verb{\no\barnumbers}	% issue MusiXTeX \co\mmand
-% \barnumbering0
 % \slope{30}		% Fool MusiXTeX into 30 / 10 steeper beam
 % \stemlength3		% shorter \stemlength
 %		% because piece is set very tightly
-%%1		% double co\mments are included in .tex file
-ii_menuetto = \music {
-	\clef"alto"\meter{3/4}
+
+ii_menuetto = \melodic{
+	\clef"alto"
+	\meter{3/4}
 	\key {bes}
-	\octave{1}
+	\octave{c}
+
 	\duration{8}
 	< a2 f2 d2 df > bes4-.  |
 %%2
@@ -95,17 +93,15 @@ ii_menuetto = \music {
 	
 }
 
-\score {
-	\staff { 
-		\melodic \music { $ii_menuetto }
-	}
-	\paper {
+\score{
+	\staff{ $ii_menuetto }
+	\paper{
 		\width 195\mm
 		\unitspace 9\mm  % to get lily to use only three lines
 		\geometric 1.4
 		\output "scsii-menuetto.out"
 	}
-	\midi { 
+	\midi{ 
 		\tempo 4:120
 		\output "scsii-menuetto.midi"
 	}
diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index 9e3389a370..24888841b7 100644
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -4,15 +4,17 @@
 %
 %	Public Domain -- typed by by HWN
 %
-global=\music{\meter {4/4}
-		\grouping {2*2}
-		\key {bes es as}
+ global = \melodic{
+ 	\meter{ 4/4 }
+ 	\grouping{ 2*2 }
+ 	\key{ bes es as }
+  }
+  
+ dux = \melodic{ 
+ 	\clef\violin
+ 	\octave{ c }
+ 	\duration{ \last }
 
-}
-
-dux = \music { 
-	\clef \violin\octave{1}
-	\duration { \last }
 	\stem{-1}
 	 r8-"dux" 	
 	[c'16 b] [c'8 g] [as c'16 b] [c'8 d'] |
@@ -25,8 +27,9 @@ dux = \music {
 	r8 [as g f] [g f16 es] [f8 d] | 
 }
 
-comes = \music { 
-	\octave {2}\stem{1}
+comes = \melodic{ 
+	\octave{ c' }
+	\stem{1}
 	r1 |
 	r1 |
 	r8-"comes" [g16 fis] [g8 c] [es g16 f] [g8 a]|
@@ -38,9 +41,9 @@ comes = \music {
 	
 }
 
-bassdux = \music { 
+bassdux = \melodic{ 
 	\clef \bass
-	\octave {1}
+	\octave{ c }
 	r1 |
 	r |
 	r |
@@ -51,23 +54,14 @@ bassdux = \music {
 	[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 }
-	\music{global}	
-	}
+% every "melody" declared in a staff has its own "voicegroup"
+trebstaf = \staff{ global dux comes }	
 
-basstaf = \staff { \melodic
-	\music { bassdux }
-	\music{global}	
-}
-\score {
-	\staff { trebstaf }
-	\staff { basstaf }
-	
-	\paper {}
-	\midi {
+\score{
+	trebstaf
+	\staff{ bassdux global }
+	\paper{}
+	\midi{
 		\tempo 4:90
 	}
 }
-- 
2.39.5