* scm/framework-gnome.scm: Add pango decoders.

[lilypond.git] / ly / catalan.ly

diff --git a/ly/catalan.ly b/ly/catalan.ly
index 99ae0dc72360b3808611e049b3b171ffe47c6d05..f0425045647ae0b63743393c1b4ea71c3509aede 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -13,61 +13,66 @@
 (sostenido) .
 %}
 
-% contributed by Jaume Obrador <jobrador@ipc4.uib.es>
+% contributed by Jaume Obrador <<jobrador@ipc4.uib.es>>
 
-\notenames {
-       dobb    = \musicalpitch { -1 0 -2 }
-       dob     = \musicalpitch { -1 0 -1 }
-       do              = \musicalpitch { -1 0 0 }
-       dod     = \musicalpitch { -1 0 1 }
-       dodd    = \musicalpitch { -1 0 2 }
-       rebb    = \musicalpitch { -1 1 -2 }
-       reb     = \musicalpitch { -1 1 -1 }
-       re              = \musicalpitch { -1 1 0 }
-       red     = \musicalpitch { -1 1 1 }
-       redd    = \musicalpitch { -1 1 2 }
-       mibb    = \musicalpitch { -1 2 -2 }
-       mib             = \musicalpitch { -1 2 -1 }
-       mi              = \musicalpitch { -1 2 0 }
-       mid     = \musicalpitch { -1 2 1 }
-       midd    = \musicalpitch { -1 2 2 }
-       fabb    = \musicalpitch { -1 3 -2 }
-       fab     = \musicalpitch { -1 3 -1 }
-       fa              = \musicalpitch { -1 3 0 }
-       fad     = \musicalpitch { -1 3 1 }
-       fadd    = \musicalpitch { -1 3 2 }
-       solbb   = \musicalpitch { -1 4 -2 }
-       solb    = \musicalpitch { -1 4 -1 }
-       sol     = \musicalpitch { -1 4 0 }
-       sold    = \musicalpitch { -1 4 1 }
-       soldd   = \musicalpitch { -1 4 2 }
-       labb    = \musicalpitch { -1 5 -2 }
-       lab     = \musicalpitch { -1 5 -1 }
-       la              = \musicalpitch { -1 5 0 }
-       lad     = \musicalpitch { -1 5 1 }
-       ladd    = \musicalpitch { -1 5 2 }
-       sibb    = \musicalpitch { -1 6 -2 }
-       sib     = \musicalpitch { -1 6 -1 }
-       si              = \musicalpitch { -1 6 0 }
-       sid     = \musicalpitch { -1 6 1 }
-       sidd    = \musicalpitch { -1 6 2 }
 
 % For using "sostingut" notation, which is also correct
+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))
 
-       dos     = \musicalpitch { -1 0 1 }
-       doss    = \musicalpitch { -1 0 2 }
-       res     = \musicalpitch { -1 1 1 }
-       ress    = \musicalpitch { -1 1 2 }
-       mis     = \musicalpitch { -1 2 1 }
-       miss    = \musicalpitch { -1 2 2 }
-       fas     = \musicalpitch { -1 3 1 }
-       fass    = \musicalpitch { -1 3 2 }
-       sols    = \musicalpitch { -1 4 1 }
-       solss   = \musicalpitch { -1 4 2 }
-       las     = \musicalpitch { -1 5 1 }
-       lass    = \musicalpitch { -1 5 2 }
-       sis     = \musicalpitch { -1 6 1 }
-       siss    = \musicalpitch { -1 6 2 }
-}
+       ;; 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 "2.2.0"
+
+#(ly:parser-set-note-names parser pitchnames)