X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fcatalan.ly;h=aab7edf923390688d2a5724ebaaf3295f6084010;hb=fb09f28821ce6ce66ec508ddaa8c9320d2813695;hp=2d3d5238c5a9e2965c1c775bf7c5ff3275d7a44a;hpb=305fb79f24233b261b5372168f76520f84d2ea87;p=lilypond.git

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 2d3d5238c5..aab7edf923 100644
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -1,8 +1,9 @@
 %{
 
- Common catalan names for notes. "b" means flat (bemoll), "d" means sharp (diesi).
- Also "s" is included for sharp (sostingut).  Both "diesi" and "sostingut" are approved
- by "Diccionari de la Llengua Catalana" from "Institut d'Estudis Catalans".
+ Common catalan names for notes. "b" means flat (bemoll), "d" means sharp
+ (diesi).  Also "s" is included for sharp (sostingut).  Both "diesi" and
+ "sostingut" are approved by "Diccionari de la Llengua Catalana" from
+ "Institut d'Estudis Catalans".
 
  Adapted from italiano.ly.
 
@@ -13,62 +14,66 @@
 (sostenido) .
 %}
 
-% contributed by Jaume Obrador <jobrador@ipc4.uib.es>
+% contributed by Jaume Obrador <<jobrador@ipc4.uib.es>>
 
 
 % 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 ))
+pitchnamesCatalan = #`(
+	(dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+	(dob . ,(ly:make-pitch -1 0 FLAT))
+	(do . ,(ly:make-pitch -1 0 NATURAL))
+	(dod . ,(ly:make-pitch -1 0 SHARP))
+	(dodd . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+	(rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+	(reb . ,(ly:make-pitch -1 1 FLAT))
+	(re . ,(ly:make-pitch -1 1 NATURAL))
+	(red . ,(ly:make-pitch -1 1 SHARP))
+	(redd . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+	(mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+	(mib . ,(ly:make-pitch -1 2 FLAT))
+	(mi . ,(ly:make-pitch -1 2 NATURAL))
+	(mid . ,(ly:make-pitch -1 2 SHARP))
+	(midd . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+	(fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+	(fab . ,(ly:make-pitch -1 3 FLAT))
+	(fa . ,(ly:make-pitch -1 3 NATURAL))
+	(fad . ,(ly:make-pitch -1 3 SHARP))
+	(fadd . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+	(solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+	(solb . ,(ly:make-pitch -1 4 FLAT))
+	(sol . ,(ly:make-pitch -1 4 NATURAL))
+	(sold . ,(ly:make-pitch -1 4 SHARP))
+	(soldd . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+	(labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+	(lab . ,(ly:make-pitch -1 5 FLAT))
+	(la . ,(ly:make-pitch -1 5 NATURAL))
+	(lad . ,(ly:make-pitch -1 5 SHARP))
+	(ladd . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+	(sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+	(sib . ,(ly:make-pitch -1 6 FLAT))
+	(si . ,(ly:make-pitch -1 6 NATURAL))
+	(sid . ,(ly:make-pitch -1 6 SHARP))
+	(sidd . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+
+	;; Now that we have espanol.ly, should these be junked? --jcn
+	(dos . ,(ly:make-pitch -1 0 SHARP))
+	(doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+	(res . ,(ly:make-pitch -1 1 SHARP))
+	(ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+	(mis . ,(ly:make-pitch -1 2 SHARP))
+	(miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+	(fas . ,(ly:make-pitch -1 3 SHARP))
+	(fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+	(sols . ,(ly:make-pitch -1 4 SHARP))
+	(solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+	(las . ,(ly:make-pitch -1 5 SHARP))
+	(lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+	(sis . ,(ly:make-pitch -1 6 SHARP))
+	(siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
 )
 
+pitchnames = \pitchnamesCatalan
 
+\version "2.12.0"
 
-\version "1.3.59";
+#(ly:parser-set-note-names parser pitchnames)