Yoshinobu Ishizaki's multiple header definition patch. Thanks!

[lilypond.git] / scm / clef.scm

diff --git a/scm/clef.scm b/scm/clef.scm
index e8304b06225cf33a0ba60198e22c10deca7161f4..aeb34db579e7114cd82eb2f7b37e4fe96f3f89ed 100644 (file)
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -2,14 +2,14 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c)  2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
 ;; (name . (glyph clef-position octavation))
 ;;
 ;; -- the name clefOctavation is misleading. The value 7 is 1 octave,
 ;; not 7 Octaves.
-(define supported-clefs
+(define-public supported-clefs
   '(("treble" . ("clefs.G" -2 0))
     ("violin" . ("clefs.G" -2 0))
     ("G" . ("clefs.G" -2 0))
@@ -29,39 +29,39 @@
     ("tab" . ("clefs.tab" 0 0))
 
     ;; should move mensural stuff to separate file?
-    ("vaticana-do1" . ("clefs.vaticana-do" -1 0))
-    ("vaticana-do2" . ("clefs.vaticana-do" 1 0))
-    ("vaticana-do3" . ("clefs.vaticana-do" 3 0))
-    ("vaticana-fa1" . ("clefs.vaticana-fa" -1 0))
-    ("vaticana-fa2" . ("clefs.vaticana-fa" 1 0))
-    ("medicaea-do1" . ("clefs.medicaea-do" -1 0))
-    ("medicaea-do2" . ("clefs.medicaea-do" 1 0))
-    ("medicaea-do3" . ("clefs.medicaea-do" 3 0))
-    ("medicaea-fa1" . ("clefs.medicaea-fa" -1 0))
-    ("medicaea-fa2" . ("clefs.medicaea-fa" 1 0))
-    ("hufnagel-do1" . ("clefs.hufnagel-do" -1 0))
-    ("hufnagel-do2" . ("clefs.hufnagel-do" 1 0))
-    ("hufnagel-do3" . ("clefs.hufnagel-do" 3 0))
-    ("hufnagel-fa1" . ("clefs.hufnagel-fa" -1 0))
-    ("hufnagel-fa2" . ("clefs.hufnagel-fa" 1 0))
-    ("hufnagel-do-fa" . ("clefs.hufnagel-do-fa" 4 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))
-    ("neomensural-c1" . ("clefs.neomensural-c" -4 0))
-    ("neomensural-c2" . ("clefs.neomensural-c" -2 0))
-    ("neomensural-c3" . ("clefs.neomensural-c" 0 0))
-    ("neomensural-c4" . ("clefs.neomensural-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))))
+    ("vaticana-do1" . ("clefs.vaticana.do" -1 0))
+    ("vaticana-do2" . ("clefs.vaticana.do" 1 0))
+    ("vaticana-do3" . ("clefs.vaticana.do" 3 0))
+    ("vaticana-fa1" . ("clefs.vaticana.fa" -1 0))
+    ("vaticana-fa2" . ("clefs.vaticana.fa" 1 0))
+    ("medicaea-do1" . ("clefs.medicaea.do" -1 0))
+    ("medicaea-do2" . ("clefs.medicaea.do" 1 0))
+    ("medicaea-do3" . ("clefs.medicaea.do" 3 0))
+    ("medicaea-fa1" . ("clefs.medicaea.fa" -1 0))
+    ("medicaea-fa2" . ("clefs.medicaea.fa" 1 0))
+    ("hufnagel-do1" . ("clefs.hufnagel.do" -1 0))
+    ("hufnagel-do2" . ("clefs.hufnagel.do" 1 0))
+    ("hufnagel-do3" . ("clefs.hufnagel.do" 3 0))
+    ("hufnagel-fa1" . ("clefs.hufnagel.fa" -1 0))
+    ("hufnagel-fa2" . ("clefs.hufnagel.fa" 1 0))
+    ("hufnagel-do-fa" . ("clefs.hufnagel.do.fa" 4 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))
+    ("neomensural-c1" . ("clefs.neomensural.c" -4 0))
+    ("neomensural-c2" . ("clefs.neomensural.c" -2 0))
+    ("neomensural-c3" . ("clefs.neomensural.c" 0 0))
+    ("neomensural-c4" . ("clefs.neomensural.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 middle C for
 ;; that symbol"
@@ -71,24 +71,24 @@
     ("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.neomensural-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)))
+    ("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.neomensural.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-public (make-clef-set clef-name)
   "Generate the clef setting commands for a clef with name CLEF-NAME."
@@ -121,7 +121,7 @@
               (csp (make-music 'ContextSpeccedMusic)))
          (context-spec-music seq 'Staff))
        (begin
-         (ly:warn (_ "Unknown clef type `~a' clef-name"))
-         (ly:warn (_ "See scm/lily.scm for supported clefs"))
+         (ly:warning (_ "unknown clef type `~a'") clef-name)
+         (ly:warning (_ "see scm/clef.scm for supported clefs"))
          (make-music 'Music)))))