From 6c9c8b25d51b3438b86e453be57f8e15ef856580 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 30 Mar 2006 17:00:05 +0000 Subject: [PATCH] * mf/GNUmakefile ($(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg): remove canary. * lily/pango-font.cc (pango_item_string_stencil): only use uXXX glyphnames if we have a ttf font. --- ChangeLog | 3 +++ lily/pango-font.cc | 2 +- mf/GNUmakefile | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e7984611b..3844774ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-03-30 Han-Wen Nienhuys + * mf/GNUmakefile ($(outdir)/emmentaler-%.otf + $(outdir)/emmentaler-%.svg): remove canary. + * lily/pango-font.cc (pango_item_string_stencil): only use uXXX glyphnames if we have a ttf font. diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 1faa34fc40..f6f4253689 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -153,7 +153,7 @@ 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; + SCM char_id = SCM_EOL; if (glyph_name[0] == '\0' && cmap diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 270eb06489..b19b3400d1 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -61,7 +61,7 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable) # -$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/pe-script-canary $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa $(outdir)/feta-alphabet%.pfa $(outdir)/parmesan%.pfa +$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa $(outdir)/feta-alphabet%.pfa $(outdir)/parmesan%.pfa cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe) $(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa) @@ -84,7 +84,7 @@ $(outdir)/aybabtu.fontname: $(outdir)/aybabtu.subfonts: echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@ -$(PE_SCRIPTS) $(outdir)/pe-script-canary: $(buildscript-dir)/gen-emmentaler-scripts.py +$(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py $(PYTHON) $< --dir=$(outdir) $(outdir)/fonts.cache-1: $(PFA_FILES) $(OTF_FILES) -- 2.39.2