From 37dd6278153b188ba59c4c58ff90540c4d7d69ad Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 2 Jan 2008 23:13:55 -0200
Subject: [PATCH] Change build system for mf2pt1 font generation.

---
 mf/GNUmakefile                        | 14 +++++++-------
 stepmake/stepmake/metafont-rules.make | 11 ++++-------
 stepmake/stepmake/metafont-vars.make  |  2 ++
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b57930a3b0..2ea49e0221 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -56,13 +56,13 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 #
 
 
-$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa  $(outdir)/feta-alphabet%.pfa  $(outdir)/parmesan%.pfa $(outdir)/feta%.otf-table $(outdir)/feta%.otf-gtable
+$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfb  $(outdir)/feta-alphabet%.pfb  $(outdir)/parmesan%.pfb $(outdir)/feta%.otf-table $(outdir)/feta%.otf-gtable
 	cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe)
 
-$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa) $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
+$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
 	cd $(outdir) && $(FONTFORGE) -script aybabtu.pe
 
-$(outdir)/%.pfa: $(outdir)/%.log
+$(outdir)/%.pfb: $(outdir)/%.log
 
 $(outdir)/%.otf-table: $(outdir)/%.lisp
 	cat $< \
@@ -84,7 +84,7 @@ $(outdir)/feta11.otf-table: $(outdir)/feta11.lisp $(outdir)/parmesan11.lisp $(ou
 
 $(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe
 
-$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa)
+$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
 
 $(outdir)/aybabtu.fontname:
 	echo -n 'aybabtu' > $@
@@ -95,11 +95,11 @@ $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py
 	$(PYTHON) $< --dir=$(outdir)
 
 ALL_FONTS = $(FETA_FONTS)
-PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
+PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
 
 # Make tfm files first, log files last,
 # so that normally log files aren't made twice
-ALL_GEN_FILES=$(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) 
+ALL_GEN_FILES=$(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFB_FILES) $(OTF_FILES) $(SVG_FILES) 
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
@@ -115,7 +115,7 @@ INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg
 INSTALLATION_OUT_FILES4=$(SVG_FILES)
 
 INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
-INSTALLATION_OUT_FILES5=$(PFA_FILES)
+INSTALLATION_OUT_FILES5=$(PFB_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 
diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index b33bd10be6..2030f00158 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -13,11 +13,8 @@ $(outdir)/%.tfm $(outdir)/%.log: %.mf
 	mv $(basename $(@F)).log $(basename $(@F)).tfm $(outdir)
 	rm -f $(basename $(@F)).*gf  $(basename $(@F)).*pk
 
+$(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
+	cd $(outdir) && MFINPUTS=.. $(PERL) ../$(buildscript-dir)/mf2pt1.pl $(MF2PT1_OPTIONS) $<
 
-MFTRACE_FORMATS = pfa pfb svg
-$(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
-	MFINPUTS=$(src-dir) $(MFTRACE) $(MFTRACE_FLAGS) -I $(src-dir) -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
-#	-mv $(MFTRACE_FORMATS:%=$(basename $(@F).%)) $(outdir)
-	-mv $(basename $(@F)).pfa $(outdir)
-	-mv $(basename $(@F)).pfb $(outdir)
-	-mv $(basename $(@F)).svg $(outdir)
+$(outdir)/mf2pt1.mem:
+	cd $(outdir) && mpost -progname=mpost -ini ../mf2pt1 \\dump
diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make
index db3722edcd..49a755e6a3 100644
--- a/stepmake/stepmake/metafont-vars.make
+++ b/stepmake/stepmake/metafont-vars.make
@@ -7,5 +7,7 @@ MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log))
 DVI_FILES += $(MF_DVI_FILES)
 TFM_FILES += $(MF_TFM_FILES)
 
+MF2PT1_OPTIONS=--rounding=0.001 
+
 
 
-- 
2.39.2