From d42b0b2f8ab129bf7efdc0913baf966c70b0d3b0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 30 Mar 2006 15:51:03 +0000 Subject: [PATCH] (pango_item_string_stencil): only use uXXX glyphnames if we have a ttf font. --- ChangeLog | 5 +++++ lily/pango-font.cc | 7 ++++++- mf/GNUmakefile | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e53998cb0..5e7984611b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-30 Han-Wen Nienhuys + + * lily/pango-font.cc (pango_item_string_stencil): only use uXXX + glyphnames if we have a ttf font. + 2006-03-30 Mats Bengtsson * Documentation/user/advanced-notation.itely (Font selection): diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 0dd9633860..1faa34fc40 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -154,7 +154,12 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); SCM char_id; - if (glyph_name[0] == '\0' && cmap) + if (glyph_name[0] == '\0' + && cmap + + /* Ugh should ask FreeType about font type. */ + && (file_name.find (".ttf") != NPOS + || file_name.find (".TTF") != NPOS)) { FT_ULong char_code = cmap->find (pg)->second; get_unicode_name (glyph_name, char_code); diff --git a/mf/GNUmakefile b/mf/GNUmakefile index e983457bb7..270eb06489 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -84,7 +84,7 @@ $(outdir)/aybabtu.fontname: $(outdir)/aybabtu.subfonts: echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@ -$(outdir)/pe-script-canary: $(buildscript-dir)/gen-emmentaler-scripts.py +$(PE_SCRIPTS) $(outdir)/pe-script-canary: $(buildscript-dir)/gen-emmentaler-scripts.py $(PYTHON) $< --dir=$(outdir) $(outdir)/fonts.cache-1: $(PFA_FILES) $(OTF_FILES) -- 2.39.2