X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fespanol.ly;h=7b1ef9995eba2a01a1744079789553312b22157c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=8a88833f1fb08d233c53241c60030ae2332f5b7b;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/ly/espanol.ly b/ly/espanol.ly
index 8a88833f1f..7b1ef9995e 100644
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -1,9 +1,7 @@
 %%%% common Spanish names for notes
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 2002--2009 Carlos García Suárez <cgscqmp@terra.es>
-%%%%                Maximiliano G. G. <mxgdvg@yahoo.it>
-%%%%                  (double-flats, double-sharps, quarter-tones, etc.)
+%%%% Copyright (C) 2010--2014 Valentin Villenave <valentin@villenave.net>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
 %%%% it under the terms of the GNU General Public License as published by
@@ -18,108 +16,8 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.12.0"
+%%%% Legacy file. (see scm/define-note-names.scm)
 
-%{
+\version "2.16.0"
 
-  b   = flat (bemol)
-  bb  = double-flat
-  cb  = quarter-tone flat (cuarto [de tono de] bemol)
-  tcb = three-quarter-tones flat (tres cuartos [de tonos de] bemol)
-
-  s   = sharp (sostenido)
-  x   = double-sharp
-  ss  = double-sharp
-  cs  = quarter-tone sharp (cuarto [de tono de] sostenido)
-  tcs = three-quarter-tones sharp (tres cuartos [de tonos de] sostenido)
-
-  English: c   d   e   f   g   a   b
-  Spanish: do  re  mi  fa  sol la  si
-
-  Adapted from italiano.ly.
-
-%}
-
-pitchnamesEspanol = #`(
-	(dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
-	(dotcb . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
-	(dob . ,(ly:make-pitch -1 0 FLAT))
-	(docb . ,(ly:make-pitch -1 0 SEMI-FLAT))
-	(do . ,(ly:make-pitch -1 0 NATURAL))
-	(docs . ,(ly:make-pitch -1 0 SEMI-SHARP))
-	(dos . ,(ly:make-pitch -1 0 SHARP))
-	(dotcs . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
-	(doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-	(dox . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
-
-	(rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
-	(retcb . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
-	(reb . ,(ly:make-pitch -1 1 FLAT))
-	(recb . ,(ly:make-pitch -1 1 SEMI-FLAT))
-	(re . ,(ly:make-pitch -1 1 NATURAL))
-	(recs . ,(ly:make-pitch -1 1 SEMI-SHARP))
-	(res . ,(ly:make-pitch -1 1 SHARP))
-	(retcs . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
-	(ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-	(rex . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
-
-	(mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
-	(mitcb . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
-	(mib . ,(ly:make-pitch -1 2 FLAT))
-	(micb . ,(ly:make-pitch -1 2 SEMI-FLAT))
-	(mi . ,(ly:make-pitch -1 2 NATURAL))
-	(mics . ,(ly:make-pitch -1 2 SEMI-SHARP))
-	(mis . ,(ly:make-pitch -1 2 SHARP))
-	(mitcs . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
-	(miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-	(mix . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
-
-	(fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
-	(fatcb . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
-	(fab . ,(ly:make-pitch -1 3 FLAT))
-	(facb . ,(ly:make-pitch -1 3 SEMI-FLAT))
-	(fa . ,(ly:make-pitch -1 3 NATURAL))
-	(facs . ,(ly:make-pitch -1 3 SEMI-SHARP))
-	(fas . ,(ly:make-pitch -1 3 SHARP))
-	(fatcs . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
-	(fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-	(fax . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
-
-	(solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
-	(soltcb . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
-	(solb . ,(ly:make-pitch -1 4 FLAT))
-	(solcb . ,(ly:make-pitch -1 4 SEMI-FLAT))
-	(sol . ,(ly:make-pitch -1 4 NATURAL))
-	(solcs . ,(ly:make-pitch -1 4 SEMI-SHARP))
-	(sols . ,(ly:make-pitch -1 4 SHARP))
-	(soltcs . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
-	(solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-	(solx . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
-
-	(labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
-	(latcb . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
-	(lab . ,(ly:make-pitch -1 5 FLAT))
-	(lacb . ,(ly:make-pitch -1 5 SEMI-FLAT))
-	(la . ,(ly:make-pitch -1 5 NATURAL))
-	(lacs . ,(ly:make-pitch -1 5 SEMI-SHARP))
-	(las . ,(ly:make-pitch -1 5 SHARP))
-	(latcs . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
-	(lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-	(lax . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
-
-	(sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
-	(sitcb . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
-	(sib . ,(ly:make-pitch -1 6 FLAT))
-	(sicb . ,(ly:make-pitch -1 6 SEMI-FLAT))
-	(si . ,(ly:make-pitch -1 6 NATURAL))
-	(sics . ,(ly:make-pitch -1 6 SEMI-SHARP))
-	(sis . ,(ly:make-pitch -1 6 SHARP))
-	(sitcs . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
-	(siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-	(six . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-
-)
-
-pitchnames = \pitchnamesEspanol
-
-#(ly:parser-set-note-names parser pitchnames)
+\language "espanol"