X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fespanol.ly;h=90305f603e846e50e9e20a383a16a99aabd6b5fc;hb=0c77902e90b113823f3ea0004d7dfaf8aed218a8;hp=de0ee56ca5ca9c6866bf88144db645fcff7b9357;hpb=ea8506894a420e3393858a3ee284ab6b2f12c6d6;p=lilypond.git

diff --git a/ly/espanol.ly b/ly/espanol.ly
index de0ee56ca5..90305f603e 100644
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -8,54 +8,56 @@
 
 %}
 
-% contributed by Carlos García Suárez <cgscqmp@terra.es>
+% contributed by Carlos García Suárez <<cgscqmp@terra.es>>
 
 
 % For using "sostingut" notation, which is also correct
-\pitchnames #`(
-	(dobb . ,(ly:make-pitch -1 0 -2 ))
-	(dob . ,(ly:make-pitch -1 0 -1 ))
-	(do . ,(ly:make-pitch -1 0 0 ))
-	(dos . ,(ly:make-pitch -1 0 1 ))
-	(doss . ,(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 ))
-	(res . ,(ly:make-pitch -1 1 1 ))
-	(ress . ,(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 ))
-	(mis . ,(ly:make-pitch -1 2 1 ))
-	(miss . ,(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 ))
-	(fas . ,(ly:make-pitch -1 3 1 ))
-	(fass . ,(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 ))
-	(sols . ,(ly:make-pitch -1 4 1 ))
-	(solss . ,(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 ))
-	(las . ,(ly:make-pitch -1 5 1 ))
-	(lass . ,(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 ))
-	(sis . ,(ly:make-pitch -1 6 1 ))
-	(siss . ,(ly:make-pitch -1 6 2 ))
+pitchnamesEspanol = #`(
+	(dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+	(dob . ,(ly:make-pitch -1 0 FLAT))
+	(do . ,(ly:make-pitch -1 0 NATURAL))
+	(dos . ,(ly:make-pitch -1 0 SHARP))
+	(doss . ,(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))
+	(res . ,(ly:make-pitch -1 1 SHARP))
+	(ress . ,(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))
+	(mis . ,(ly:make-pitch -1 2 SHARP))
+	(miss . ,(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))
+	(fas . ,(ly:make-pitch -1 3 SHARP))
+	(fass . ,(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))
+	(sols . ,(ly:make-pitch -1 4 SHARP))
+	(solss . ,(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))
+	(las . ,(ly:make-pitch -1 5 SHARP))
+	(lass . ,(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))
+	(sis . ,(ly:make-pitch -1 6 SHARP))
+	(siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
 )
 
+pitchnames = \pitchnamesEspanol
 
+\version "2.12.0"
 
-\version "1.7.18"
+#(ly:parser-set-note-names parser pitchnames)