From: Patrick McCarty <pnorcks@gmail.com>
Date: Sat, 6 Mar 2010 20:39:04 +0000 (-0800)
Subject: Change the PostScript name for Emmentaler-Brace.
X-Git-Tag: release/2.13.16-1~49
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1bcc3a3e8bd097f4d9bb99337ac488648fcfbc8a;p=lilypond.git

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 4c85cae39d..dabbecb7e1 100644
--- 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 5464d93767..eebc231ac5 100644
--- 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))