X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fcatalan.ly;h=5e78273656c0a2791c5da8d915752bdf371b4d95;hb=da73acff78a9f9b625f995ddf990d6c99657a73a;hp=dcb1ba84cfcd5656f9c745db40ee2b7a33220ef3;hpb=e9bd265943d37689b1a6892217cb6f67bbe69f73;p=lilypond.git diff --git a/ly/catalan.ly b/ly/catalan.ly index dcb1ba84cf..5e78273656 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -1,76 +1,95 @@ +%%%% common Catalan names for notes +%%%% This file is part of LilyPond, the GNU music typesetter. +%%%% +%%%% Copyright (C) 1998--2009 Jaume Obrador +%%%% +%%%% LilyPond is free software: you can redistribute it and/or modify +%%%% it under the terms of the GNU General Public License as published by +%%%% the Free Software Foundation, either version 3 of the License, or +%%%% (at your option) any later version. +%%%% +%%%% LilyPond is distributed in the hope that it will be useful, +%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%%%% GNU General Public License for more details. +%%%% +%%%% You should have received a copy of the GNU General Public License +%%%% along with LilyPond. If not, see . + +\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 + Adapted from italiano.ly. +%} -% 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 )) - (dod . ,(ly:make-pitch -1 0 1 )) - (dodd . ,(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 )) - (red . ,(ly:make-pitch -1 1 1 )) - (redd . ,(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 )) - (mid . ,(ly:make-pitch -1 2 1 )) - (midd . ,(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 )) - (fad . ,(ly:make-pitch -1 3 1 )) - (fadd . ,(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 )) - (sold . ,(ly:make-pitch -1 4 1 )) - (soldd . ,(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 )) - (lad . ,(ly:make-pitch -1 5 1 )) - (ladd . ,(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 )) - (sid . ,(ly:make-pitch -1 6 1 )) - (sidd . ,(ly: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 1 )) - (doss . ,(ly:make-pitch -1 0 2 )) - (res . ,(ly:make-pitch -1 1 1 )) - (ress . ,(ly:make-pitch -1 1 2 )) - (mis . ,(ly:make-pitch -1 2 1 )) - (miss . ,(ly:make-pitch -1 2 2 )) - (fas . ,(ly:make-pitch -1 3 1 )) - (fass . ,(ly:make-pitch -1 3 2 )) - (sols . ,(ly:make-pitch -1 4 1 )) - (solss . ,(ly:make-pitch -1 4 2 )) - (las . ,(ly:make-pitch -1 5 1 )) - (lass . ,(ly:make-pitch -1 5 2 )) - (sis . ,(ly:make-pitch -1 6 1 )) - (siss . ,(ly:make-pitch -1 6 2 )) + (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.9.1" +#(ly:parser-set-note-names parser pitchnames)