X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=stepmake%2Fstepmake%2Fmetafont-rules.make;h=a04fdf158c5772bcfbf6d9a7072125e1af8528e9;hb=54685cedab8c7e6ce9cfc754dc6b6c646e8421ff;hp=df23a2fb43e5414e3946c2241ad1ba7d07274413;hpb=b71bb68fd8b36ec4b00cfec5e620c53087983fc0;p=lilypond.git

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index df23a2fb43..a04fdf158c 100644
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -1,17 +1,41 @@
 
+# Don't remove $(outdir)/.log's.  Logs are a target!
+
+# we want to see botched results as well.
 $(outdir)/%.dvi: %.mf
-	mf $<
+	-$(METAFONT) "\nonstopmode; input $<;"
 	gftodvi  $(basename $<)
-	mv   $(basename $<).dvi $(outdir)
+	mv $(basename $<).dvi $(outdir)
 	rm $(basename $<).*gf
 
 $(outdir)/%.log: %.mf
-	mf $<
+	$(METAFONT) $<
 	mv $(@F) $@
-	rm $(basename $< ).*gf
+	rm $(basename $(@F)).*gf
+
+$(outdir)/%.tfm $(outdir)%.log: %.mf
+	$(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
+	$(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
+	$(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F))
+	mv $(basename $(@F)).pfa $(outdir)
 
+$(outdir)/%.pfb: %.mf
+	$(MFTRACE) -I $(outdir)/ --pfb --simplify --keep-trying  $(basename $(@F))
+	mv $(basename $(@F)).pfb $(outdir)
 
-$(outdir)/%.tfm: %.mf
-	mf '\mode:=ljfour;  input $<;'
-	mv $(@F) $(outdir)
-	rm $(basename $<).*gf $(basename $<).*log
+#%.afm:
+#	$(SHELL) $(depth)/buildscripts/tfmtoafm.sh $(shell basename $@ .afm)
+#	mv $@ $@.in