From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 29 May 2011 09:41:15 +0000 (+0200)
Subject: Allow for spaces in ttf font glyph names.  Fixes #1562.
X-Git-Tag: release/2.15.0-1~25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dbe720d6a2e6cbb1e60160c8d04a4d7ac658ac1d;hp=c75e554c93a26d28bf58fb41a5cfbaf13eec115d;p=lilypond.git

Allow for spaces in ttf font glyph names.  Fixes #1562.

Apparently, the Verdana.ttf font that comes with Windows 7 SP1
has glyphs 571 and 571 using names "glyph 571" and "glyph 572", i.e.,
their glyph names contain spaces.  This breaks the PostScript output.

Thanks to Chris Lidell and James Lowe for their help to nail this
bug.
---

diff --git a/THANKS b/THANKS
index 565a49b2d3..64e2a1f97c 100644
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ Kieren MacMillan
 
 BUG HUNTERS/SUGGESTIONS
 
+Chris Liddell
 Chris Snyder
 David Kastrup
 Karim Haddad
diff --git a/lily/ttf.cc b/lily/ttf.cc
index d0507f773d..4bd6378f27 100644
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -453,7 +453,7 @@ print_trailer (void *out,
 
       if (glyph_name[0])
 	{
-	  lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
+	  lily_cookie_fprintf (out, "(%s) cvn %d def ", glyph_name, i);
 	  output_count ++;
 	}
       else