X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fespanol.ly;h=90305f603e846e50e9e20a383a16a99aabd6b5fc;hb=6ccfd4eb63825bd294af654572068c1c1af13c70;hp=be0bc2207354ce91858bf382de5fd48fda210a3a;hpb=b9b40f154d0dfa9c3fcd44028bd8b745b87e4873;p=lilypond.git

diff --git a/ly/espanol.ly b/ly/espanol.ly
index be0bc22073..90305f603e 100644
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -1,70 +1,63 @@
 %{
 
- Common Spanish names for notes. "b" means flat (bemol), "s" means
- sharp (sostenido).
- 
+ Common Spanish names for notes. "b" means flat (bemol), "s" means sharp (sostenido).
  Adapted from italiano.ly.
 
  English: a   b   c   d   e   f   g
  Spanish: la  si  do  re  mi  fa  sol
 
- For some strange reason, dutch.ly and german.ly were renamed to
- follow the (ms-dos?) norsk naming convention.
-
- For spanish.ly, it should actually be "espa~nol.ly" with a "n with
- tilde on top" As the n with tilde is possibly not a good character to
- have I would write without the tilde, that is "espanol.ly"
-
 %}
 
-% contributed by Carlos Garc'ia Su'arez <cgscqmp@terra.es>
+% contributed by Carlos García Suárez <<cgscqmp@terra.es>>
 
 
 % 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 ))
-	(dos . ,(make-pitch -1 0 1 ))
-	(doss . ,(make-pitch -1 0 2 ))
-
-	(rebb . ,(make-pitch -1 1 -2 ))
-	(reb . ,(make-pitch -1 1 -1 ))
-	(re . ,(make-pitch -1 1 0 ))
-	(res . ,(make-pitch -1 1 1 ))
-	(ress . ,(make-pitch -1 1 2 ))
-
-	(mibb . ,(make-pitch -1 2 -2 ))
-	(mib . ,(make-pitch -1 2 -1 ))
-	(mi . ,(make-pitch -1 2 0 ))
-	(mis . ,(make-pitch -1 2 1 ))
-	(miss . ,(make-pitch -1 2 2 ))
-
-	(fabb . ,(make-pitch -1 3 -2 ))
-	(fab . ,(make-pitch -1 3 -1 ))
-	(fa . ,(make-pitch -1 3 0 ))
-	(fas . ,(make-pitch -1 3 1 ))
-	(fass . ,(make-pitch -1 3 2 ))
-
-	(solbb . ,(make-pitch -1 4 -2 ))
-	(solb . ,(make-pitch -1 4 -1 ))
-	(sol . ,(make-pitch -1 4 0 ))
-	(sols . ,(make-pitch -1 4 1 ))
-	(solss . ,(make-pitch -1 4 2 ))
-
-	(labb . ,(make-pitch -1 5 -2 ))
-	(lab . ,(make-pitch -1 5 -1 ))
-	(la . ,(make-pitch -1 5 0 ))
-	(las . ,(make-pitch -1 5 1 ))
-	(lass . ,(make-pitch -1 5 2 ))
-
-	(sibb . ,(make-pitch -1 6 -2 ))
-	(sib . ,(make-pitch -1 6 -1 ))
-	(si . ,(make-pitch -1 6 0 ))
-	(sis . ,(make-pitch -1 6 1 ))
-	(siss . ,(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.5.49"
+#(ly:parser-set-note-names parser pitchnames)