From 98e98c972212b441b9c09cc5156a95ef6c58977f Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Sat, 25 Jul 2009 20:07:02 -0700 Subject: [PATCH] Adjust "font-name-style" procedure for SVG backend Changes to make this procedure more generic for matching both fonts with string names and font smobs that need their names extracted. In the future, if all fonts are identified with string names, and the "feta-alphabet" PFB fonts are no longer used, this procedure may need to be adjusted. Note that this procedure is only used for the SVG backend. --- scm/lily-library.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scm/lily-library.scm b/scm/lily-library.scm index 489921abcd..d1cce2a84c 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -593,17 +593,19 @@ possibly turned off." ;;; FONT may be font smob, or pango font string... (define-public (font-name-style font) - ;; FIXME: ughr, (ly:font-name) sometimes also has Style appended. + ;; FIXME: ughr, barf: feta-alphabet is actually emmentaler + (if (and (string? font) + (string-prefix? "feta-alphabet" font)) + (string-append "emmentaler" + "-" + (substring font + (string-length "feta-alphabet") + (string-length font))) (let* ((font-name (ly:font-name font)) - (full-name (if font-name font-name (ly:font-file-name font))) - (name-style (string-split full-name #\-))) - ;; FIXME: ughr, barf: feta-alphabet is actually emmentaler - (if (string-prefix? "feta-alphabet" full-name) - (list "emmentaler" - (substring full-name (string-length "feta-alphabet"))) - (if (not (null? (cdr name-style))) - name-style - (append name-style '("Regular")))))) + (full-name (if font-name font-name (ly:font-file-name font)))) + (if (string-prefix? "Aybabtu" full-name) + "aybabtu" + (string-downcase full-name))))) (define-public (modified-font-metric-font-scaling font) (let* ((designsize (ly:font-design-size font)) -- 2.39.5