X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=0a576e5467aa102e61dc4564d08d8a5fdbec9585;hb=8ae0f4d296b1e78b2a012e31ad2f7ed828fea1ad;hp=3925ccc051738ebbdb7730f984b4cdc368c5a09e;hpb=c64a05795e51367c17589a9e7d60bad426305159;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 3925ccc051..0a576e5467 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -1,40 +1,87 @@
-# mf/Makefile
-
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont metapost install install-out
+STEPMAKE_TEMPLATES=metafont install install-out
+LOCALSTEPMAKE_TEMPLATES=asciifont
+
+
+include $(depth)/make/stepmake.make 
+
+AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini
+EXTRA_DIST_FILES += README feta.tex
 
-FET_FILES = $(wildcard feta[0-9]*.mf) feta-din10.mf
+# don't try to make fonts from test files
+TEST_FILES = $(wildcard *test*.mf)
+FET_FILES = $(filter-out $(TEST_FILES),\
+  $(wildcard feta[0-9]*.mf) $(wildcard parmesan[0-9]*.mf))
+FONT_FILES = $(filter-out $(TEST_FILES),\
+$(wildcard feta*[0-9].mf) $(wildcard parmesan*[0-9].mf))
 
-LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly))
-LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
-TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-AFM_IN_FILES = $(wildcard *.afm.in)
-AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) \
-  $(addprefix $(outdir)/, $(AFM_IN_FILES:.in=))
-XPM_FONTS = feta20
+XPM_FONTS = feta20 feta-nummer10 feta-braces20
+#CM_AFM_FILES = cmr10
 
-ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
+$(outdir)/cmr10.afm:
+	-$(GUILE) $(buildscript-dir)/tfm2oafm.scm `kpsewhich cmr10.tfm`
+	-mv $(@F) $@
+
+LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log) $(PARMESAN_FILES:.mf=.log))
+TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex) $(PARMESAN_FILES:.mf=.tex))
+AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(PARMESAN_FILES:.mf=.afm) $(AF_FILES:.af=.afm) $(addsuffix .afm, $(CM_AFM_FILES)))
+ENC_FILES=$(TEXTABLES:.tex=.enc)
+TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
+
+
+# Make tfm files first, log files last, 
+# so that normally log files aren't made twice
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
-INSTALLATION_DIR=$(datadir)/mf/
-INSTALLATION_FILES=$(MF_FILES)
+INSTALLATION_DIR=$(datadir)/fonts/source
+INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
+
+INSTALLATION_OUT_SUFFIXES=1 2 3 4 5
+
+INSTALLATION_OUT_DIR1=$(datadir)/tex
+INSTALLATION_OUT_FILES1=$(TEXTABLES)
 
-INSTALLATION_OUT_DIR=$(datadir)/tex
-INSTALLATION_OUT_FILES=$(TEXTABLES)
+INSTALLATION_OUT_DIR2=$(datadir)/fonts/afm
+INSTALLATION_OUT_FILES2=$(AFM_FILES)
 
-INSTALLATION_OUT_DIR1=$(datadir)/afm
-INSTALLATION_OUT_FILES1=$(AFM_FILES)
+INSTALLATION_OUT_DIR3=$(datadir)/fonts/tfm
+INSTALLATION_OUT_FILES3=$(TFM_FILES)
+
+# comment this out if you don't want pfa's to be generated
+# making pfas takes a lot of CPU time. Let's skip it for now.
+#MAKE_PFA_FILES=1
+
+PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
+
+ifdef MAKE_PFA_FILES
+ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map
+INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1
+INSTALLATION_OUT_FILES4=$(PFA_FILES)
+
+INSTALLATION_OUT_DIR5=$(datadir)/dvips/
+INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map
+
+endif
 
-INSTALLATION_OUT_DIR2=$(datadir)/ly
-INSTALLATION_OUT_FILES2=$(LYTABLES)
 export MFINPUTS:=.:$(MFINPUTS)
-include $(depth)/make/stepmake.make 
 
 default: $(ALL_GEN_FILES)
 
-$(outdir)/%.afm $(outdir)/%.ly $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
-	$(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --ly $(outdir)/$(<F:.log=.ly) --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
+$(outdir)/lilypond.map: 
+	echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \
+		sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@
+
+##
+## todo: this also depends on .tfm, FIXME.
+$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
+	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm)  --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
+
+local-clean:
+	rm -f mfplain.mem mfplain.log 
+	rm -f *.tfm *.log
+
+pfa: $(PFA_FILES)