* stepmake/stepmake/metafont-rules.make: make single SVG/PFA/PFB

rule.

* configure.in (gui_b): bump mftrace requirement to 1.1.0

* mf/GNUmakefile (ALL_GEN_FILES): make SVG files too.

diff --git a/ChangeLog b/ChangeLog
index e7ff3e633a659fc0eaf897a7499daeec8d618f6e..12413404f67724c86950b428347c5b8d4fc86716 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-12-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * stepmake/stepmake/metafont-rules.make: make single SVG/PFA/PFB
+       rule.
+
+       * configure.in (gui_b): bump mftrace requirement to 1.1.0
+
        * mf/feta-bolletjes.mf (triangle): add s to 0triangle.
 
        * mf/GNUmakefile (ALL_GEN_FILES): make SVG files too.

diff --git a/configure.in b/configure.in
index 68b3aca31de6f7036570692b3a2d7a6049476bf3..d9f0050f6254ceee54974e898460b18eadd450d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,7 @@ STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.0.27)
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.0)
 
 # mftrace for generating pfa's, pfb's
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index d198342b5a95a0b66ff66f1a424c762f7aa96a58..6d7fc92e4c60d40a0f7202ace5de2c526de1414c 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -24,7 +24,8 @@ PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES)))
 OTF_TABLES = $(addsuffix .otf-table, $(addprefix $(outdir)/feta, $(STAFF_SIZES))) \
  $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
-SVG_FILES = $(OTF_FILES:%.otf=%.svg)
+SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
+
 
 $(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
        cat $^ > $@
@@ -66,15 +67,14 @@ $(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.otf-table $(
 $(outdir)/aybabtu.subfonts: 
         echo $(subst .mf,,$(wildcard feta-braces-[a-z].mf)) > $@
 
-$(PE_SCRIPTS):
-       $(PYTHON) $(buildscript-dir)/gen-bigcheese-scripts.py --dir=$(outdir)
+$(PE_SCRIPTS): $(buildscript-dir)/gen-bigcheese-scripts.py
+       $(PYTHON) $< --dir=$(outdir)
 
 include $(outdir)/bigcheese20.dep
 
 
 ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
-PFB_FILES = $(PFA_FILES:%.pfa=%.pfb)
 
 # Make tfm files first, log files last, 
 # so that normally log files aren't made twice
@@ -209,17 +209,17 @@ local-clean:
        rm -f mfplain.mem mfplain.log 
        rm -f *.tfm *.log
 
-afm: $(AFM_FILES)
-pfa: afm $(PFA_FILES) fontdir
-pfb: afm $(PFB_FILES) fontdir
-
-
-# stupid trick to have separate rules for each PFA font ;
-# otherwise building PFAs is all-or-nothing.
-
-
-$(outdir)/%.pfa: $(outdir)/%.bla
-       $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
+#afm: $(AFM_FILES)
+#pfa: afm $(PFA_FILES) fontdir
+#pfb: afm $(PFB_FILES) fontdir
+#
+#
+## stupid trick to have separate rules for each PFA font ;
+## otherwise building PFAs is all-or-nothing.
+#
+#
+#$(outdir)/%.pfa $(outdir)/%.svg: $(outdir)/%.bla
+#      $(MFTRACE) -I $(outdir)/ --formats=pfa,svg --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
 
 $(outdir)/%.enc.in: %.enc
        cp $< $@

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index fb2e6d44280bda60488bbcc11ba5a5a1e958822b..4741dcc0af2bb0d6a905b29c3eb9f02b3c7fb284 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -29,15 +29,9 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
        gftopk $< $@
 
 
-$(outdir)/%.pfa: %.mf
-       $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --simplify $(basename $(@F))
+$(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
+       $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=pfa,pfb,svg --simplify $(basename $(@F))
        mv $(basename $(@F)).pfa $(outdir)
-
-$(outdir)/%.pfb: %.mf
-       $(MFTRACE)  $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --pfb --simplify  $(basename $(@F))
-       -mv $(basename $(@F)).pfa $(outdir)
-       mv $(basename $(@F)).pfb $(outdir)
-
 #%.afm:
 #      $(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm)
 #      mv $@ $@.in