juergen, heikki, chris patch.

[lilypond.git] / scm / clef.scm

diff --git a/scm/clef.scm b/scm/clef.scm
index f9625ff1d56dc970c96738b87da695b1414f2f4f..50d853c0df2315e68d5d083093ad7af9502aa577 100644 (file)
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -12,6 +12,7 @@
          ("soprano" . ("clefs-C" -4  0))
          ("mezzosoprano" . ("clefs-C" -2  0))
          ("alto" . ("clefs-C" 0 0))
+         ("C" . ("clefs-C" 0 0))
          ("tenor" . ("clefs-C" 2 0))
          ("baritone" . ("clefs-C" 4  0))
          ("varbaritone"  . ("clefs-F" 0 0))
@@ -38,44 +39,54 @@
          ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1 0))
          ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1 0))
          ("hufnagel_do_fa" . ("clefs-hufnagel_do_fa" 4 0))
-         ("mensural1_c1" . ("clefs-mensural1_c" -4 0))
-         ("mensural1_c2" . ("clefs-mensural1_c" -2 0))
-         ("mensural1_c3" . ("clefs-mensural1_c" 0 0))
-         ("mensural1_c4" . ("clefs-mensural1_c" 2 0))
-         ("mensural2_c1" . ("clefs-mensural2_c" -4 0))
-         ("mensural2_c2" . ("clefs-mensural2_c" -2 0))
-         ("mensural2_c3" . ("clefs-mensural2_c" 0 0))
-         ("mensural2_c4" . ("clefs-mensural2_c" 2 0))
-         ("mensural2_c5" . ("clefs-mensural2_c" 4 0))
-         ("mensural3_c1" . ("clefs-mensural3_c" -2 0))
-         ("mensural3_c2" . ("clefs-mensural3_c" 0 0))
-         ("mensural3_c3" . ("clefs-mensural3_c" 2 0))
-         ("mensural3_c4" . ("clefs-mensural3_c" 4 0))
-         ("mensural1_f" . ("clefs-mensural1_f" 2 0))
-         ("mensural2_f" . ("clefs-mensural2_f" 2 0))
+         ("mensural_c1" . ("clefs-mensural_c" -2 0))
+         ("mensural_c2" . ("clefs-mensural_c" 0 0))
+         ("mensural_c3" . ("clefs-mensural_c" 2 0))
+         ("mensural_c4" . ("clefs-mensural_c" 4 0))
+         ("mensural_f" . ("clefs-mensural_f" 2 0))
          ("mensural_g" . ("clefs-mensural_g" -2 0))
+         ("neo_mensural_c1" . ("clefs-neo_mensural_c" -4 0))
+         ("neo_mensural_c2" . ("clefs-neo_mensural_c" -2 0))
+         ("neo_mensural_c3" . ("clefs-neo_mensural_c" 0 0))
+         ("neo_mensural_c4" . ("clefs-neo_mensural_c" 2 0))
+         ("petrucci_c1" . ("clefs-petrucci_c1" -4 0))
+         ("petrucci_c2" . ("clefs-petrucci_c2" -2 0))
+         ("petrucci_c3" . ("clefs-petrucci_c3" 0 0))
+         ("petrucci_c4" . ("clefs-petrucci_c4" 2 0))
+         ("petrucci_c5" . ("clefs-petrucci_c5" 4 0))
+         ("petrucci_f" . ("clefs-petrucci_f" 2 0))
+         ("petrucci_g" . ("clefs-petrucci_g" -2 0))
        )
 )
 
-; "an alist mapping GLYPHNAME to the position of the central C for that symbol")
+
+;; "an alist mapping GLYPHNAME to the position of the central C for that symbol"
 (define c0-pitch-alist
   '(("clefs-G" . -4)
-         ("clefs-C" . 0)
-         ("clefs-F" . 4)
-         ("clefs-vaticana_do" . 0)
-         ("clefs-vaticana_fa" . 4)
-         ("clefs-medicaea_do" . 0)
-         ("clefs-medicaea_fa" . 4)
-         ("clefs-hufnagel_do" . 0)
-         ("clefs-hufnagel_fa" . 4)
-         ("clefs-hufnagel_do_fa" . 0)
-         ("clefs-mensural1_c" . 0)
-         ("clefs-mensural2_c" . 0)
-         ("clefs-mensural3_c" . 0)
-         ("clefs-mensural1_f" . 4)
-         ("clefs-mensural2_f" . 4)
-         ("clefs-mensural_g" . -4))
+    ("clefs-C" . 0)
+    ("clefs-F" . 4)
+    ("clefs-percussion" . 0)
+    ("clefs-tab" . 0 )
+    ("clefs-vaticana_do" . 0)
+    ("clefs-vaticana_fa" . 4)
+    ("clefs-medicaea_do" . 0)
+    ("clefs-medicaea_fa" . 4)
+    ("clefs-hufnagel_do" . 0)
+    ("clefs-hufnagel_fa" . 4)
+    ("clefs-hufnagel_do_fa" . 0)
+    ("clefs-mensural_c" . 0)
+    ("clefs-mensural_f" . 4)
+    ("clefs-mensural_g" . -4)
+    ("clefs-neo_mensural_c" . 0)
+    ("clefs-petrucci_c1" . 0)
+    ("clefs-petrucci_c2" . 0)
+    ("clefs-petrucci_c3" . 0)
+    ("clefs-petrucci_c4" . 0)
+    ("clefs-petrucci_c5" . 0)
+    ("clefs-petrucci_f" . 4)
+    ("clefs-petrucci_g" . -4)
   )
+)
 
 (define (clef-name-to-properties cl)
   (let ((e '())
@@ -112,7 +123,7 @@
           )
          ((symbol . clefOctavation)
                 (iterator-ctor . ,Property_iterator::constructor)
-                (value . ,oct)
+                (value . ,(- oct))
               )
          )
        (begin