Change the PostScript name for Emmentaler-Brace.

The Emmentaler-Brace font does not use multiple design sizes, so the
style name (Regular) does not need to be appended to the PostScript font
name.

This also fixes a workaround in scm/lily-library.scm, since the SVG
backend expects the font/style name to agree with the font's filename.

diff --git a/mf/emmentaler-brace.pe.in b/mf/emmentaler-brace.pe.in
index 4c85cae39daeb508b2d7451a78f9124ce5d45296..dabbecb7e1ce12f520dfaa6d45f7e4bd364cb7b8 100644 (file)
--- a/mf/emmentaler-brace.pe.in
+++ b/mf/emmentaler-brace.pe.in
@@ -54,7 +54,7 @@ MergeFonts("feta-braces-g.scale.pfb");
 MergeFonts("feta-braces-h.scale.pfb");
 MergeFonts("feta-braces-i.scale.pfb");
 
-SetFontNames("Emmentaler-Brace-Regular", "Emmentaler-Brace", "Emmentaler-Brace Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
+SetFontNames("Emmentaler-Brace", "Emmentaler-Brace", "Emmentaler-Brace Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
 
 i = 0;
 while (i < CharCnt())

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 5464d93767bc2935f703251a84397b7b78b4a9fe..eebc231ac574b572c05a8b04a676cf10c3c46822 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -708,9 +708,7 @@ applied to function @var{getter}.")
                                (string-length font)))
       (let* ((font-name (ly:font-name font))
             (full-name (if font-name font-name (ly:font-file-name font))))
-       (if (string-prefix? "Emmentaler-Brace" full-name)
-           "emmentaler-brace"
-           (string-downcase full-name)))))
+         (string-downcase full-name))))
 
 (define-public (modified-font-metric-font-scaling font)
   (let* ((designsize (ly:font-design-size font))