Merge branch 'master' into dev/texi2html

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

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 745c231c48256610251b1c30ca175b1a9ac89c7d..de4e658fe4860231433da840f6ff3df50a60283d 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))
@@ -401,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")))
 
@@ -678,11 +679,15 @@ centered, X==1 is at the right, X == -1 is at the left."
 
 (define-public (fret-board::calc-stencil grob)
   (let* ((string-frets (ly:grob-property grob 'string-fret-finger-combinations))
-        (string-count (ly:grob-property grob 'string-count)))
+        (string-count (assoc-get 
+                         'string-count 
+                         (ly:grob-property grob 'fret-diagram-details)
+                         6)))
     
-    (grob-interpret-markup grob
-                          (make-fret-diagram-verbose-markup
-                           (string-frets->description string-frets string-count)))))
+    (grob-interpret-markup 
+      grob
+      (make-fret-diagram-verbose-markup
+       (string-frets->description string-frets string-count)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; scripts