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

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 3c750c7bfe..2ccf2f7b2c 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,25 +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
 
+# This is not metafont, this is feta-specific
 $(outdir)/%.log: %.mf
-	$(METAFONT) $<
+	MFINPUTS=$(src-dir) $(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
 	mv $(@F) $@
 	rm $(basename $(@F)).*gf
 
 $(outdir)/%.tfm $(outdir)%.log: %.mf
-	$(METAFONT) "\mode:=$(MFMODE); nonstopmode; input $<;"
+	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 
+	rm $(basename $(@F)).*gf
 
 $(outdir)/%.$(XPM_RESOLUTION)gf: %.mf
-	$(METAFONT) "\\mode=$(XPM_MODE); \\input $<"
+	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)
 
@@ -27,13 +29,13 @@ $(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)
+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)
 
 #%.afm:
 #	$(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm)