patch::: 1.4.1.jcn2

[lilypond.git] / ly / catalan.ly

diff --git a/ly/catalan.ly b/ly/catalan.ly
index a2f842c2f3e8961f108272fc72cc65278dc1bbf7..74d42851d1990510b2d2c2ecef1c4e023868841b 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -17,58 +17,58 @@
 
 
 % For using "sostingut" notation, which is also correct
-\notenames #'(
-       (dobb . ( -1 0 -2 ))
-       (dob . ( -1 0 -1 ))
-       (do . ( -1 0 0 ))
-       (dod . ( -1 0 1 ))
-       (dodd . ( -1 0 2 ))
-       (rebb . ( -1 1 -2 ))
-       (reb . ( -1 1 -1 ))
-       (re . ( -1 1 0 ))
-       (red . ( -1 1 1 ))
-       (redd . ( -1 1 2 ))
-       (mibb . ( -1 2 -2 ))
-       (mib . ( -1 2 -1 ))
-       (mi . ( -1 2 0 ))
-       (mid . ( -1 2 1 ))
-       (midd . ( -1 2 2 ))
-       (fabb . ( -1 3 -2 ))
-       (fab . ( -1 3 -1 ))
-       (fa . ( -1 3 0 ))
-       (fad . ( -1 3 1 ))
-       (fadd . ( -1 3 2 ))
-       (solbb . ( -1 4 -2 ))
-       (solb . ( -1 4 -1 ))
-       (sol . ( -1 4 0 ))
-       (sold . ( -1 4 1 ))
-       (soldd . ( -1 4 2 ))
-       (labb . ( -1 5 -2 ))
-       (lab . ( -1 5 -1 ))
-       (la . ( -1 5 0 ))
-       (lad . ( -1 5 1 ))
-       (ladd . ( -1 5 2 ))
-       (sibb . ( -1 6 -2 ))
-       (sib . ( -1 6 -1 ))
-       (si . ( -1 6 0 ))
-       (sid . ( -1 6 1 ))
-       (sidd . ( -1 6 2 ))
-       (dos . ( -1 0 1 ))
-       (doss . ( -1 0 2 ))
-       (res . ( -1 1 1 ))
-       (ress . ( -1 1 2 ))
-       (mis . ( -1 2 1 ))
-       (miss . ( -1 2 2 ))
-       (fas . ( -1 3 1 ))
-       (fass . ( -1 3 2 ))
-       (sols . ( -1 4 1 ))
-       (solss . ( -1 4 2 ))
-       (las . ( -1 5 1 ))
-       (lass . ( -1 5 2 ))
-       (sis . ( -1 6 1 ))
-       (siss . ( -1 6 2 ))
+\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 ))
 )
 
 
 
-\version "1.3.38";
+\version "1.3.146"