patch::: 1.5.19.jcn2

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

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index a5364c45e86924d536d1f49b81899bb3e6eff25a..039121f527a435990c68913c0ffd49445ab357c1 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -83,6 +83,7 @@ centered, X==1 is at the right, X == -1 is at the left."
     ((default) '(1.0 . 0.5))
     ((cross) '(1.0 . 0.75))
     ((mensural) '(0.0 . 0.6))
+    ((neo_mensural) '(0.0 . 0.6))
     ((diamond) '(1.0 . 0.8))
     ((transparent) '(1.0 . 1.0))
     ((slash) '(1.0 . 1.0))
@@ -120,7 +121,11 @@ centered, X==1 is at the right, X == -1 is at the left."
                (font-load-command (car x) (cdr x)))
              (map cdr font-name-alist))))
 
-(define (fontify name-mag-pair exp)
+;; urg, how can exp be #unspecified?  -- in sketch output
+(define (xfontify name-mag-pair exp)
   (string-append (select-font name-mag-pair)
                 exp))
 
+(define (fontify name-mag-pair exp)
+  (string-append (select-font name-mag-pair)
+                (if (string? exp) exp "")))