Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / ly / catalan.ly

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 74d42851d1990510b2d2c2ecef1c4e023868841b..71165622f96b2fb1c6db84bcf434905e080f343f 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -1,74 +1,83 @@
+%%%% catalan.ly -- common Catalan names for notes
+%%%%
+%%%% source file of the GNU LilyPond music typesetter
+%%%%
+%%%% (c) 1998--2009 Jaume Obrador <jobrador@ipc4.uib.es>
+
+\version "2.12.0"
+
 %{
 
- 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".
+  b  = flat (bemoll)
+  bb = double-flat
 
- Adapted from italiano.ly.
+  d  = sharp (diesi)
+  dd = double-sharp
 
- English: a   b   c   d   e   f   g
- Catalan: la  si  do  re  mi  fa  sol
+  s  = sharp (sostingut)
+  ss = double-sharp
 
- For spanish naming just use the sharp sign "s" (sostenido) instead of "s"
-(sostenido) .
-%}
+  English: c   d   e   f   g   a   b
+  Catalan: do  re  mi  fa  sol la  si
 
-% contributed by Jaume Obrador <jobrador@ipc4.uib.es>
+  Adapted from italiano.ly.
 
+%}
 
-% 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 ))
-)
+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 "1.3.146"
+#(ly:parser-set-note-names parser pitchnames)