From: Han-Wen Nienhuys Date: Sat, 30 Dec 2006 18:35:48 +0000 (+0100) Subject: junk XPM support from Metafont. X-Git-Tag: release/2.11.6-1~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7591c2679e61b97c8a1cb1dab1e9a7c6c900ae21;p=lilypond.git junk XPM support from Metafont. --- diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 0be194896b..263a7f8b36 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -12,15 +12,7 @@ $(outdir)/%.tfm $(outdir)%.log: %.mf MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;" # Let's keep this log output, it saves another mf run. mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir) - rm $(basename $(@F)).*gf - -$(outdir)/%.$(XPM_RESOLUTION)gf: %.mf - MFINPUTS=$(src-dir) $(METAFONT) "\\mode=$(XPM_MODE); \\input $<" -# Let's keep this log output, it saves another mf run. - mv $(@F) $(basename $(@F)).log $(basename $(@F)).tfm $(outdir) - -$(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf - gftopk $< $@ + rm -f $(basename $(@F)).*gf MFTRACE_FORMATS = pfa pfb svg diff --git a/stepmake/stepmake/metafont-targets.make b/stepmake/stepmake/metafont-targets.make index 616e5868a7..dfaf2c18ce 100644 --- a/stepmake/stepmake/metafont-targets.make +++ b/stepmake/stepmake/metafont-targets.make @@ -3,10 +3,5 @@ tfm: $(TFM_FILES) dvi: $(DVI_FILES) -pks: $(addprefix $(outdir)/, $(XPM_FONTS:%=%.$(XPM_RESOLUTION)pk)) - -xpms: $(addprefix $(outdir)/, $(XPM_FONTS:%=%.afm)) pks - $(foreach i, $(XPM_FONTS), $(SHELL) $(depth)/buildscripts/mf-to-xpms.sh $(i) && ) true - pfb: $(PFB_FILES) diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make index c1636f1c9f..db3722edcd 100644 --- a/stepmake/stepmake/metafont-vars.make +++ b/stepmake/stepmake/metafont-vars.make @@ -7,14 +7,5 @@ MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log)) DVI_FILES += $(MF_DVI_FILES) TFM_FILES += $(MF_TFM_FILES) -# XPM_MODE=sun -# XPM_RESOLUTION=85 - -# XPM_MODE=declarge -# XPM_RESOLUTION=100 - -XPM_MODE=ibmvga -XPM_RESOLUTION=110 -