summaryrefslogtreecommitdiff
path: root/lily
diff options
context:
space:
mode:
authorMasamichi Hosoda <trueroad@trueroad.jp>2016-06-25 19:05:42 +0900
committerMasamichi Hosoda <trueroad@trueroad.jp>2016-07-04 21:46:34 +0900
commit22559b0c3837f49762caa52a7b05f35a156c595f (patch)
tree2787f1476bd61ab150129d0a35c0554d462c136f /lily
parentde9831ffbac6592724492a21b084726e370bd362 (diff)
Issue 4876/4: Enable fontname replacing in TrueType functions
This commit enables fontname replacing for CFF (OTF/OTC) fonts.
Diffstat (limited to 'lily')
-rw-r--r--lily/ttf.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/lily/ttf.cc b/lily/ttf.cc
index 2af774e414..02ccdb8dd4 100644
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -67,7 +67,7 @@ print_header (void *out, FT_Face face)
lily_cookie_fprintf (out, "%d dict begin\n", 11);
lily_cookie_fprintf (out, "/FontName /%s def\n",
- FT_Get_Postscript_Name (face));
+ get_postscript_name (face).c_str ());
lily_cookie_fprintf (out, "/Encoding StandardEncoding def\n");
lily_cookie_fprintf (out, "/PaintType 0 def\n");
@@ -533,8 +533,7 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name",
}
face = open_ft_face (file_name, i);
- char const *ps_name_str0 = FT_Get_Postscript_Name (face);
- SCM ps_name = scm_from_locale_string (ps_name_str0 ? ps_name_str0 : "");
+ SCM ps_name = scm_from_locale_string (get_postscript_name (face).c_str ());
FT_Done_Face (face);
debug_output ("]", false);