Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / scm / output-lib.scm

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 77e69b0759f45e517a857c90aba735d83de5d491..c5e7ad131eab702cdccd1db69b445df2cc7fa079 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -293,6 +293,7 @@ centered, X==1 is at the right, X == -1 is at the left."
 ;; Color
 
 (define-public color? list?)
+(define-public (rgb-color r g b) (list r g b))
 
 ; predefined colors
 (define-public black       '(0.0 0.0 0.0))
@@ -383,6 +384,9 @@ centered, X==1 is at the right, X == -1 is at the left."
        (-3/4 . "accidentals.mirroredflat.flat")
        ))
 
+;; FIXME: standard vs default, alteration-FOO vs FOO-alteration
+(define-public alteration-default-glyph-name-alist standard-alteration-glyph-name-alist)
+
 (define-public makam-alteration-glyph-name-alist
      '((1 . "accidentals.doublesharp")
        (8/9 . "accidentals.sharp.slashslashslash.stemstem")
@@ -398,22 +402,22 @@ centered, X==1 is at the right, X == -1 is at the left."
        ))
   
 (define-public alteration-hufnagel-glyph-name-alist
-   '((-1/2 . "accidentals.hufnagel-1")
+   '((-1/2 . "accidentals.hufnagelM1")
      (0 . "accidentals.vaticana0")
      (1/2 . "accidentals.mensural1")))
 
 (define-public alteration-medicaea-glyph-name-alist
-   '((-1/2 . "accidentals.medicaea-1")
+   '((-1/2 . "accidentals.medicaeaM1")
      (0 . "accidentals.vaticana0")
      (1/2 . "accidentals.mensural1")))
 
 (define-public alteration-vaticana-glyph-name-alist
-   '((-1/2 . "accidentals.vaticana-1")
+   '((-1/2 . "accidentals.vaticanaM1")
      (0 . "accidentals.vaticana0")
      (1/2 . "accidentals.mensural1")))
 
 (define-public alteration-mensural-glyph-name-alist
-   '((-1/2 . "accidentals.mensural-1")
+   '((-1/2 . "accidentals.mensuralM1")
      (0 . "accidentals.vaticana0")
      (1/2 . "accidentals.mensural1")))