From 51991fab1ee70c01a4038b5a106d755370acc434 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:51:29 +0000
Subject: [PATCH] lilypond-1.3.39

---
 ly/catalan.ly | 103 +++++++++++------------
 ly/english.ly | 223 +++++++++++++++++---------------------------------
 2 files changed, 125 insertions(+), 201 deletions(-)

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 99ae0dc723..a2f842c2f3 100644
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -15,59 +15,60 @@
 
 % contributed by Jaume Obrador <jobrador@ipc4.uib.es>
 
-\notenames {
-	dobb 	= \musicalpitch { -1 0 -2 }
-	dob 	= \musicalpitch { -1 0 -1 }
-	do 		= \musicalpitch { -1 0 0 }
-	dod 	= \musicalpitch { -1 0 1 }
-	dodd 	= \musicalpitch { -1 0 2 }
-	rebb 	= \musicalpitch { -1 1 -2 }
-	reb 	= \musicalpitch { -1 1 -1 }
-	re 		= \musicalpitch { -1 1 0 }
-	red 	= \musicalpitch { -1 1 1 }
-	redd 	= \musicalpitch { -1 1 2 }
-	mibb	= \musicalpitch { -1 2 -2 }
-	mib		= \musicalpitch { -1 2 -1 }
-	mi	 	= \musicalpitch { -1 2 0 }
-	mid 	= \musicalpitch { -1 2 1 }
-	midd 	= \musicalpitch { -1 2 2 }
-	fabb 	= \musicalpitch { -1 3 -2 }
-	fab 	= \musicalpitch { -1 3 -1 }
-	fa	 	= \musicalpitch { -1 3 0 }
-	fad 	= \musicalpitch { -1 3 1 }
-	fadd 	= \musicalpitch { -1 3 2 }
-	solbb 	= \musicalpitch { -1 4 -2 }
-	solb 	= \musicalpitch { -1 4 -1 }
-	sol 	= \musicalpitch { -1 4 0 }
-	sold 	= \musicalpitch { -1 4 1 }
-	soldd 	= \musicalpitch { -1 4 2 }
-	labb 	= \musicalpitch { -1 5 -2 }
-	lab 	= \musicalpitch { -1 5 -1 }
-	la	 	= \musicalpitch { -1 5 0 }
-	lad 	= \musicalpitch { -1 5 1 }
-	ladd 	= \musicalpitch { -1 5 2 }
-	sibb 	= \musicalpitch { -1 6 -2 }
-	sib 	= \musicalpitch { -1 6 -1 }
-	si 		= \musicalpitch { -1 6 0 }
-	sid 	= \musicalpitch { -1 6 1 }
-	sidd 	= \musicalpitch { -1 6 2 }
 
 % For using "sostingut" notation, which is also correct
+\notenames #'(
+	(dobb . ( -1 0 -2 ))
+	(dob . ( -1 0 -1 ))
+	(do . ( -1 0 0 ))
+	(dod . ( -1 0 1 ))
+	(dodd . ( -1 0 2 ))
+	(rebb . ( -1 1 -2 ))
+	(reb . ( -1 1 -1 ))
+	(re . ( -1 1 0 ))
+	(red . ( -1 1 1 ))
+	(redd . ( -1 1 2 ))
+	(mibb . ( -1 2 -2 ))
+	(mib . ( -1 2 -1 ))
+	(mi . ( -1 2 0 ))
+	(mid . ( -1 2 1 ))
+	(midd . ( -1 2 2 ))
+	(fabb . ( -1 3 -2 ))
+	(fab . ( -1 3 -1 ))
+	(fa . ( -1 3 0 ))
+	(fad . ( -1 3 1 ))
+	(fadd . ( -1 3 2 ))
+	(solbb . ( -1 4 -2 ))
+	(solb . ( -1 4 -1 ))
+	(sol . ( -1 4 0 ))
+	(sold . ( -1 4 1 ))
+	(soldd . ( -1 4 2 ))
+	(labb . ( -1 5 -2 ))
+	(lab . ( -1 5 -1 ))
+	(la . ( -1 5 0 ))
+	(lad . ( -1 5 1 ))
+	(ladd . ( -1 5 2 ))
+	(sibb . ( -1 6 -2 ))
+	(sib . ( -1 6 -1 ))
+	(si . ( -1 6 0 ))
+	(sid . ( -1 6 1 ))
+	(sidd . ( -1 6 2 ))
+	(dos . ( -1 0 1 ))
+	(doss . ( -1 0 2 ))
+	(res . ( -1 1 1 ))
+	(ress . ( -1 1 2 ))
+	(mis . ( -1 2 1 ))
+	(miss . ( -1 2 2 ))
+	(fas . ( -1 3 1 ))
+	(fass . ( -1 3 2 ))
+	(sols . ( -1 4 1 ))
+	(solss . ( -1 4 2 ))
+	(las . ( -1 5 1 ))
+	(lass . ( -1 5 2 ))
+	(sis . ( -1 6 1 ))
+	(siss . ( -1 6 2 ))
+)
 
-	dos 	= \musicalpitch { -1 0 1 }
-	doss 	= \musicalpitch { -1 0 2 }
-	res 	= \musicalpitch { -1 1 1 }
-	ress 	= \musicalpitch { -1 1 2 }
-	mis 	= \musicalpitch { -1 2 1 }
-	miss 	= \musicalpitch { -1 2 2 }
-	fas 	= \musicalpitch { -1 3 1 }
-	fass 	= \musicalpitch { -1 3 2 }
-	sols 	= \musicalpitch { -1 4 1 }
-	solss 	= \musicalpitch { -1 4 2 }
-	las 	= \musicalpitch { -1 5 1 }
-	lass 	= \musicalpitch { -1 5 2 }
-	sis 	= \musicalpitch { -1 6 1 }
-	siss 	= \musicalpitch { -1 6 2 }
-}
 
 
+\version "1.3.38";
diff --git a/ly/english.ly b/ly/english.ly
index de66eda7d7..52022eb097 100644
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -3,156 +3,79 @@
      with s for sharp and f for flat.
 %}
 
-\notenames {
-	cflatflat 	= \musicalpitch { -1 0 -2 }
-	cflat		= \musicalpitch { -1 0 -1 }
-	c		= \musicalpitch { -1 0 0 }
-	csharp		= \musicalpitch { -1 0 1 }
-	csharpsharp 	= \musicalpitch { -1 0 2 }
-	dflatflat 	= \musicalpitch { -1 1 -2 }
-	dflat		= \musicalpitch { -1 1 -1 }
-	d		= \musicalpitch { -1 1 0 }
-	dsharp		= \musicalpitch { -1 1 1 }
-	dsharpsharp 	= \musicalpitch { -1 1 2 }
-	eflatflat	= \musicalpitch { -1 2 -2 }
-	eflat		= \musicalpitch { -1 2 -1 }
-	e		= \musicalpitch { -1 2 0 }
-	esharp		= \musicalpitch { -1 2 1 }
-	esharpsharp 	= \musicalpitch { -1 2 2 }
-	fflatflat 	= \musicalpitch { -1 3 -2 }
-	fflat 		= \musicalpitch { -1 3 -1 }
-	f 		= \musicalpitch { -1 3 0 }
-	fsharp 		= \musicalpitch { -1 3 1 }
-	fsharpsharp 	= \musicalpitch { -1 3 2 }
-	gflatflat 	= \musicalpitch { -1 4 -2 }
-	gflat 		= \musicalpitch { -1 4 -1 }
-	g 		= \musicalpitch { -1 4 0 }
-	gsharp 		= \musicalpitch { -1 4 1 }
-	gsharpsharp 	= \musicalpitch { -1 4 2 }
-	aflatflat 	= \musicalpitch { -1 5 -2 }
-	aflat 		= \musicalpitch { -1 5 -1 }
-	a 		= \musicalpitch { -1 5 0 }
-	asharp 		= \musicalpitch { -1 5 1 }
-	asharpsharp 	= \musicalpitch { -1 5 2 }
-	bflatflat 	= \musicalpitch { -1 6 -2 }
-	bflat 		= \musicalpitch { -1 6 -1 }
-	b 		= \musicalpitch { -1 6 0 }
-	bsharp 		= \musicalpitch { -1 6 1 }
-	bsharpsharp 	= \musicalpitch { -1 6 2 }
+\notenames #'(
+	(cflatflat . ( -1 0 -2 ))
+	(cflat . ( -1 0 -1 ))
+	(c . ( -1 0 0 ))
+	(csharp . ( -1 0 1 ))
+	(csharpsharp . ( -1 0 2 ))
+	(dflatflat . ( -1 1 -2 ))
+	(dflat . ( -1 1 -1 ))
+	(d . ( -1 1 0 ))
+	(dsharp . ( -1 1 1 ))
+	(dsharpsharp . ( -1 1 2 ))
+	(eflatflat . ( -1 2 -2 ))
+	(eflat . ( -1 2 -1 ))
+	(e . ( -1 2 0 ))
+	(esharp . ( -1 2 1 ))
+	(esharpsharp . ( -1 2 2 ))
+	(fflatflat . ( -1 3 -2 ))
+	(fflat . ( -1 3 -1 ))
+	(f . ( -1 3 0 ))
+	(fsharp . ( -1 3 1 ))
+	(fsharpsharp . ( -1 3 2 ))
+	(gflatflat . ( -1 4 -2 ))
+	(gflat . ( -1 4 -1 ))
+	(g . ( -1 4 0 ))
+	(gsharp . ( -1 4 1 ))
+	(gsharpsharp . ( -1 4 2 ))
+	(aflatflat . ( -1 5 -2 ))
+	(aflat . ( -1 5 -1 ))
+	(a . ( -1 5 0 ))
+	(asharp . ( -1 5 1 ))
+	(asharpsharp . ( -1 5 2 ))
+	(bflatflat . ( -1 6 -2 ))
+	(bflat . ( -1 6 -1 ))
+	(b . ( -1 6 0 ))
+	(bsharp . ( -1 6 1 ))
+	(bsharpsharp . ( -1 6 2 ))
 
-	cff 	= \musicalpitch { -1 0 -2 }
-	cf 	= \musicalpitch { -1 0 -1 }
-	c 	= \musicalpitch { -1 0 0 }
-	cs 	= \musicalpitch { -1 0 1 }
-	css 	= \musicalpitch { -1 0 2 }
-	dff 	= \musicalpitch { -1 1 -2 }
-	df 	= \musicalpitch { -1 1 -1 }
-	d 	= \musicalpitch { -1 1 0 }
-	ds 	= \musicalpitch { -1 1 1 }
-	dss 	= \musicalpitch { -1 1 2 }
-	eff	= \musicalpitch { -1 2 -2 }
-	ef	= \musicalpitch { -1 2 -1 }
-	e 	= \musicalpitch { -1 2 0 }
-	es 	= \musicalpitch { -1 2 1 }   % es = E-flat in Dutch
-	ess 	= \musicalpitch { -1 2 2 }
-	fff 	= \musicalpitch { -1 3 -2 }
-	ff 	= \musicalpitch { -1 3 -1 }
-	f 	= \musicalpitch { -1 3 0 }
-	fs 	= \musicalpitch { -1 3 1 }
-	fss 	= \musicalpitch { -1 3 2 }
-	gff 	= \musicalpitch { -1 4 -2 }
-	gf 	= \musicalpitch { -1 4 -1 }
-	g 	= \musicalpitch { -1 4 0 }
-	gs 	= \musicalpitch { -1 4 1 }
-	gss 	= \musicalpitch { -1 4 2 }
-	aff 	= \musicalpitch { -1 5 -2 }
-	af 	= \musicalpitch { -1 5 -1 }
-	a 	= \musicalpitch { -1 5 0 }
-	as 	= \musicalpitch { -1 5 1 }   % as = A-flat in Dutch
-	ass 	= \musicalpitch { -1 5 2 }
-	bff 	= \musicalpitch { -1 6 -2 }
-	bf 	= \musicalpitch { -1 6 -1 }
-	b 	= \musicalpitch { -1 6 0 }
-	bs 	= \musicalpitch { -1 6 1 }
-	bss 	= \musicalpitch { -1 6 2 }
+	(cff . ( -1 0 -2 ))
+	(cf . ( -1 0 -1 ))
+	(c . ( -1 0 0 ))
+	(cs . ( -1 0 1 ))
+	(css . ( -1 0 2 ))
+	(dff . ( -1 1 -2 ))
+	(df . ( -1 1 -1 ))
+	(d . ( -1 1 0 ))
+	(ds . ( -1 1 1 ))
+	(dss . ( -1 1 2 ))
+	(eff . ( -1 2 -2 ))
+	(ef . ( -1 2 -1 ))
+	(e . ( -1 2 0 ))
+	(es . ( -1 2 1 ))   ; es = E-flat in Dutch
+	(ess . ( -1 2 2 ))
+	(fff . ( -1 3 -2 ))
+	(ff . ( -1 3 -1 ))
+	(f . ( -1 3 0 ))
+	(fs . ( -1 3 1 ))
+	(fss . ( -1 3 2 ))
+	(gff . ( -1 4 -2 ))
+	(gf . ( -1 4 -1 ))
+	(g . ( -1 4 0 ))
+	(gs . ( -1 4 1 ))
+	(gss . ( -1 4 2 ))
+	(aff . ( -1 5 -2 ))
+	(af . ( -1 5 -1 ))
+	(a . ( -1 5 0 ))
+	(as . ( -1 5 1 ))   ; as = A-flat in Dutch
+	(ass . ( -1 5 2 ))
+	(bff . ( -1 6 -2 ))
+	(bf . ( -1 6 -1 ))
+	(b . ( -1 6 0 ))
+	(bs . ( -1 6 1 ))
+	(bss . ( -1 6 2 ))
+)
 
+\version "1.3.38";
 
-	%
-	% upper case: 1 octave lower.
-	%
-
-
-	Cflatflat 	= \musicalpitch { -2 0 -2 }
-	Cflat 		= \musicalpitch { -2 0 -1 }
-	C 		= \musicalpitch { -2 0 0 }
-	Csharp 		= \musicalpitch { -2 0 1 }
-	Csharpsharp 	= \musicalpitch { -2 0 2 }
-	Dflatflat 	= \musicalpitch { -2 1 -2 }
-	Dflat 		= \musicalpitch { -2 1 -1 }
-	D 		= \musicalpitch { -2 1 0 }
-	Dsharp 		= \musicalpitch { -2 1 1 }
-	Dsharpsharp 	= \musicalpitch { -2 1 2 }
-	Eflatflat 	= \musicalpitch { -2 2 -2 }
-	Eflat 		= \musicalpitch { -2 2 -1 }
-	E 		= \musicalpitch { -2 2 0 }
-	Esharp 		= \musicalpitch { -2 2 1 }
-	Esharpsharp 	= \musicalpitch { -2 2 2 }
-	Fflatflat 	= \musicalpitch { -2 3 -2 }
-	Fflat 		= \musicalpitch { -2 3 -1 }
-	F 		= \musicalpitch { -2 3 0 }
-	Fsharp 		= \musicalpitch { -2 3 1 }
-	Fsharpsharp 	= \musicalpitch { -2 3 2 }
-	Gflatflat 	= \musicalpitch { -2 4 -2 }
-	Gflat 		= \musicalpitch { -2 4 -1 }
-	G 		= \musicalpitch { -2 4 0 }
-	Gsharp 		= \musicalpitch { -2 4 1 }
-	Gsharpsharp 	= \musicalpitch { -2 4 2 }
-	Aflatflat 	= \musicalpitch { -2 5 -2 }
-	Aflat 		= \musicalpitch { -2 5 -1 }
-	A 		= \musicalpitch { -2 5 0 }
-	Asharp 		= \musicalpitch { -2 5 1 }
-	Asharpsharp 	= \musicalpitch { -2 5 2 }
-	Bflatflat 	= \musicalpitch { -2 6 -2 }
-	Bflat 		= \musicalpitch { -2 6 -1 }
-	B 		= \musicalpitch { -2 6 0 }
-	Bsharp 		= \musicalpitch { -2 6 1 }
-	Bsharpsharp 	= \musicalpitch { -2 6 2 }
-
-	Cff 	= \musicalpitch { -2 0 -2 }
-	Cf 	= \musicalpitch { -2 0 -1 }
-	C 	= \musicalpitch { -2 0 0 }
-	Cs 	= \musicalpitch { -2 0 1 }
-	Css 	= \musicalpitch { -2 0 2 }
-	Dff 	= \musicalpitch { -2 1 -2 }
-	Df 	= \musicalpitch { -2 1 -1 }
-	D 	= \musicalpitch { -2 1 0 }
-	Ds 	= \musicalpitch { -2 1 1 }
-	Dss 	= \musicalpitch { -2 1 2 }
-	Eff 	= \musicalpitch { -2 2 -2 }
-	Ef 	= \musicalpitch { -2 2 -1 }
-	E 	= \musicalpitch { -2 2 0 }
-	Es 	= \musicalpitch { -2 2 1 }
-	Ess 	= \musicalpitch { -2 2 2 }
-	Fff 	= \musicalpitch { -2 3 -2 }
-	Ff 	= \musicalpitch { -2 3 -1 }
-	F 	= \musicalpitch { -2 3 0 }
-	Fs 	= \musicalpitch { -2 3 1 }
-	Fss 	= \musicalpitch { -2 3 2 }
-	Gff 	= \musicalpitch { -2 4 -2 }
-	Gf 	= \musicalpitch { -2 4 -1 }
-	G 	= \musicalpitch { -2 4 0 }
-	Gs 	= \musicalpitch { -2 4 1 }
-	Gss 	= \musicalpitch { -2 4 2 }
-	Aff 	= \musicalpitch { -2 5 -2 }
-	Af 	= \musicalpitch { -2 5 -1 }
-	A 	= \musicalpitch { -2 5 0 }
-	As 	= \musicalpitch { -2 5 1 }
-	Ass 	= \musicalpitch { -2 5 2 }
-	Bff 	= \musicalpitch { -2 6 -2 }
-	Bf 	= \musicalpitch { -2 6 -1 }
-	B 	= \musicalpitch { -2 6 0 }
-	Bs 	= \musicalpitch { -2 6 1 }
-	Bss 	= \musicalpitch { -2 6 2 }
-
-
-}
-- 
2.39.5