From eda75db867a9363dcd871e008a8c896db0db544a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 1 May 2006 10:15:16 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 2 ++ buildscripts/pfx2ttf.fontforge | 2 +- mf/GNUmakefile | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dadea9805f..ef954b13d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ 2006-05-01 Han-Wen Nienhuys + * buildscripts/pfx2ttf.fontforge (err): create OTF files. + * scripts/abc2ly.py (dump_score): indent of 4 for python code. * configure.in (LINK_GXX_STATICALLY): remove locate() call. diff --git a/buildscripts/pfx2ttf.fontforge b/buildscripts/pfx2ttf.fontforge index 1c74f0ba12..ec0f9a214a 100644 --- a/buildscripts/pfx2ttf.fontforge +++ b/buildscripts/pfx2ttf.fontforge @@ -13,5 +13,5 @@ elseif ( err < 0 ) Print("An error occurred while searching for the \"numero\" glyph"); endif -Generate($3 + $fontname + ".ttf"); +Generate($3 + $fontname + ".otf"); diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 286f0b141f..79b52f91f6 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -32,7 +32,7 @@ SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg) NCSB_SOURCE_FILES=c059013l c059016l c059033l c059036l -NCSB_TTFS=$(addprefix $(outdir)/,CenturySchL-Ital.ttf CenturySchL-BoldItal.ttf CenturySchL-Roma.ttf CenturySchL-Bold.ttf) +NCSB_OTFS=$(addprefix $(outdir)/,CenturySchL-Ital.otf CenturySchL-BoldItal.otf CenturySchL-Roma.otf CenturySchL-Bold.otf) NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log) @@ -101,7 +101,7 @@ PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) # Make tfm files first, log files last, # so that normally log files aren't made twice -ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(NCSB_TTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1 +ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" @@ -114,7 +114,7 @@ INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf -INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_TTFS) +INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_OTFS) INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm INSTALLATION_OUT_FILES3=$(TFM_FILES) @@ -162,7 +162,7 @@ $(outdir)/%.enc.in: %.enc cp $< $@ -$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(NCSB_SOURCE_FILES))) $(buildscript-dir)/pfx2ttf.fontforge +$(NCSB_OTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(NCSB_SOURCE_FILES))) $(buildscript-dir)/pfx2ttf.fontforge $(foreach i,$(NCSB_SOURCE_FILES), \ $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \ $(NCSB_DIR)/$(i).pfb $(NCSB_DIR)/$(i).afm $(outdir)/ && ) true -- 2.39.2