X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fcatalan.ly;h=eea562b567401525aa5e8f846888977985688c7c;hb=08fac6579696c434b957ba81825bee824a005a84;hp=74d42851d1990510b2d2c2ecef1c4e023868841b;hpb=68a168bff1fec7f8011b2afa82d4fc89182c4bf7;p=lilypond.git

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 74d42851d1..eea562b567 100644
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -18,57 +18,59 @@
 
 % For using "sostingut" notation, which is also correct
 \pitchnames #`(
-	(dobb . ,(make-pitch -1 0 -2 ))
-	(dob . ,(make-pitch -1 0 -1 ))
-	(do . ,(make-pitch -1 0 0 ))
-	(dod . ,(make-pitch -1 0 1 ))
-	(dodd . ,(make-pitch -1 0 2 ))
-	(rebb . ,(make-pitch -1 1 -2 ))
-	(reb . ,(make-pitch -1 1 -1 ))
-	(re . ,(make-pitch -1 1 0 ))
-	(red . ,(make-pitch -1 1 1 ))
-	(redd . ,(make-pitch -1 1 2 ))
-	(mibb . ,(make-pitch -1 2 -2 ))
-	(mib . ,(make-pitch -1 2 -1 ))
-	(mi . ,(make-pitch -1 2 0 ))
-	(mid . ,(make-pitch -1 2 1 ))
-	(midd . ,(make-pitch -1 2 2 ))
-	(fabb . ,(make-pitch -1 3 -2 ))
-	(fab . ,(make-pitch -1 3 -1 ))
-	(fa . ,(make-pitch -1 3 0 ))
-	(fad . ,(make-pitch -1 3 1 ))
-	(fadd . ,(make-pitch -1 3 2 ))
-	(solbb . ,(make-pitch -1 4 -2 ))
-	(solb . ,(make-pitch -1 4 -1 ))
-	(sol . ,(make-pitch -1 4 0 ))
-	(sold . ,(make-pitch -1 4 1 ))
-	(soldd . ,(make-pitch -1 4 2 ))
-	(labb . ,(make-pitch -1 5 -2 ))
-	(lab . ,(make-pitch -1 5 -1 ))
-	(la . ,(make-pitch -1 5 0 ))
-	(lad . ,(make-pitch -1 5 1 ))
-	(ladd . ,(make-pitch -1 5 2 ))
-	(sibb . ,(make-pitch -1 6 -2 ))
-	(sib . ,(make-pitch -1 6 -1 ))
-	(si . ,(make-pitch -1 6 0 ))
-	(sid . ,(make-pitch -1 6 1 ))
-	(sidd . ,(make-pitch -1 6 2 ))
-	(dos . ,(make-pitch -1 0 1 ))
-	(doss . ,(make-pitch -1 0 2 ))
-	(res . ,(make-pitch -1 1 1 ))
-	(ress . ,(make-pitch -1 1 2 ))
-	(mis . ,(make-pitch -1 2 1 ))
-	(miss . ,(make-pitch -1 2 2 ))
-	(fas . ,(make-pitch -1 3 1 ))
-	(fass . ,(make-pitch -1 3 2 ))
-	(sols . ,(make-pitch -1 4 1 ))
-	(solss . ,(make-pitch -1 4 2 ))
-	(las . ,(make-pitch -1 5 1 ))
-	(lass . ,(make-pitch -1 5 2 ))
-	(sis . ,(make-pitch -1 6 1 ))
-	(siss . ,(make-pitch -1 6 2 ))
+	(dobb . ,(ly:make-pitch -1 0 -2 ))
+	(dob . ,(ly:make-pitch -1 0 -1 ))
+	(do . ,(ly:make-pitch -1 0 0 ))
+	(dod . ,(ly:make-pitch -1 0 1 ))
+	(dodd . ,(ly:make-pitch -1 0 2 ))
+	(rebb . ,(ly:make-pitch -1 1 -2 ))
+	(reb . ,(ly:make-pitch -1 1 -1 ))
+	(re . ,(ly:make-pitch -1 1 0 ))
+	(red . ,(ly:make-pitch -1 1 1 ))
+	(redd . ,(ly:make-pitch -1 1 2 ))
+	(mibb . ,(ly:make-pitch -1 2 -2 ))
+	(mib . ,(ly:make-pitch -1 2 -1 ))
+	(mi . ,(ly:make-pitch -1 2 0 ))
+	(mid . ,(ly:make-pitch -1 2 1 ))
+	(midd . ,(ly:make-pitch -1 2 2 ))
+	(fabb . ,(ly:make-pitch -1 3 -2 ))
+	(fab . ,(ly:make-pitch -1 3 -1 ))
+	(fa . ,(ly:make-pitch -1 3 0 ))
+	(fad . ,(ly:make-pitch -1 3 1 ))
+	(fadd . ,(ly:make-pitch -1 3 2 ))
+	(solbb . ,(ly:make-pitch -1 4 -2 ))
+	(solb . ,(ly:make-pitch -1 4 -1 ))
+	(sol . ,(ly:make-pitch -1 4 0 ))
+	(sold . ,(ly:make-pitch -1 4 1 ))
+	(soldd . ,(ly:make-pitch -1 4 2 ))
+	(labb . ,(ly:make-pitch -1 5 -2 ))
+	(lab . ,(ly:make-pitch -1 5 -1 ))
+	(la . ,(ly:make-pitch -1 5 0 ))
+	(lad . ,(ly:make-pitch -1 5 1 ))
+	(ladd . ,(ly:make-pitch -1 5 2 ))
+	(sibb . ,(ly:make-pitch -1 6 -2 ))
+	(sib . ,(ly:make-pitch -1 6 -1 ))
+	(si . ,(ly:make-pitch -1 6 0 ))
+	(sid . ,(ly:make-pitch -1 6 1 ))
+	(sidd . ,(ly:make-pitch -1 6 2 ))
+
+	;; Now that we have espanol.ly, should these be junked? --jcn
+	(dos . ,(ly:make-pitch -1 0 1 ))
+	(doss . ,(ly:make-pitch -1 0 2 ))
+	(res . ,(ly:make-pitch -1 1 1 ))
+	(ress . ,(ly:make-pitch -1 1 2 ))
+	(mis . ,(ly:make-pitch -1 2 1 ))
+	(miss . ,(ly:make-pitch -1 2 2 ))
+	(fas . ,(ly:make-pitch -1 3 1 ))
+	(fass . ,(ly:make-pitch -1 3 2 ))
+	(sols . ,(ly:make-pitch -1 4 1 ))
+	(solss . ,(ly:make-pitch -1 4 2 ))
+	(las . ,(ly:make-pitch -1 5 1 ))
+	(lass . ,(ly:make-pitch -1 5 2 ))
+	(sis . ,(ly:make-pitch -1 6 1 ))
+	(siss . ,(ly:make-pitch -1 6 2 ))
 )
 
 
 
-\version "1.3.146"
+\version "1.7.18"