X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=592a47b35159fd5d64e54c328fbce5371729abf6;hb=164e8f28f50194a13c1f16de4b8279a17ced424d;hp=3c750c7bfe8e64612530fb57a809782360fc3510;hpb=2ef0f6a17cfe1fe8b5be70a1c53212c20f6e3f30;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 3c750c7bfe..592a47b351 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,40 +1,27 @@
-
 # Don't remove $(outdir)/.log's.  Logs are a target!
 
+# we want to see botched results as well.
 $(outdir)/%.dvi: %.mf
-	$(METAFONT) "\nonstopmode; input $<;"
-	gftodvi  $(basename $<)
+	-MFINPUTS=$(src-dir) $(METAFONT) "\scrollmode; input $<;"
+	gftodvi $(basename $<)
 	mv $(basename $<).dvi $(outdir)
 	rm $(basename $<).*gf
 
-$(outdir)/%.log: %.mf
-	$(METAFONT) $<
-	mv $(@F) $@
-	rm $(basename $(@F)).*gf
-
-$(outdir)/%.tfm $(outdir)%.log: %.mf
-	$(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
+$(outdir)/%.tfm $(outdir)/%.log: %.mf
+	MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;" $(METAFONT_QUIET)
 # 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
-	$(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 $< $@
-
-
-$(outdir)/%.pfa: %.mf
-	pktrace --simplify --keep-trying $(basename $(@F))
-	mv $(basename $(@F)).pfa $(outdir)
-
-$(outdir)/%.pfb: %.mf
-	pktrace --simplify --keep-trying  $(basename $(@F))
-	mv $(basename $(@F)).pfb $(outdir)
-
-#%.afm:
-#	$(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm)
-#	mv $@ $@.in
+	rm -f $(basename $(@F)).*gf  $(basename $(@F)).*pk
+
+# ugh . mf2pt1 is extremely broken, it pollutes CWD iso. creating a
+# temp dir.
+$(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
+	TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \
+	&& ( cd $$TMP \
+		&& ln -s ../mf2pt1.mem . \
+		&& MFINPUTS=$(top-src-dir)/mf:..:: $(PERL) $(top-src-dir)/buildscripts/mf2pt1.pl $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+	&& mv $$TMP/*pfb $(outdir); \
+	rm -rf $$TMP
+
+$(outdir)/mf2pt1.mem: mf2pt1.mp
+	cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump