X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=7258626958cb1c370b4bee6d41a9d83013659417;hb=01c7f176c310496ba9f19d43ee3e80440a6128a9;hp=802c03f6b77faf36abed867428d560639c266951;hpb=5aebfda08c5434faa6ea3dcbdd10cc87879e7964;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 802c03f6b7..7258626958 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,20 +6,29 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex 
+EXTRA_DIST_FILES += README feta.tex
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\
 	$(wildcard feta-braces-[a-z].mf)\
-	$(wildcard feta-din*[0-9].mf)\
-	$(wildcard feta-nummer*[0-9].mf)\
+	$(wildcard feta-alphabet*[0-9].mf)\
 	$(wildcard parmesan[0-9]*.mf)
 
+STAFF_SIZES = 11 13 14 16 18 20 23 26
+BRACES = a b c d e f g h i
+
+CHEESES = $(addsuffix .otf, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES)))\
+ $(outdir)/aybabtu.otf
+PE_SCRIPTS = $(addsuffix .pe, $(addprefix $(outdir)/bigcheese, $(STAFF_SIZES))) \
+  $(addsuffix .dep, $(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=)
 
-XPM_FONTS = feta20 feta-din10 feta-nummer10 feta-braces20 parmesan20
+
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
+LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
 TEXTABLES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tex)
 AFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.afm) \
 	$(AF_FILES:%.af=$(outdir)/%.afm)
@@ -30,8 +39,6 @@ FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly)
 
 ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
 MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),)
-bla:
-	echo $(TFM_FILES) 
 
 # only for fonts which
 #
@@ -45,7 +52,22 @@ foe:
 	echo $(TEXMF)
 	kpsewhich exbase.mf
 
+$(outdir)/%.otf: $(outdir)/%.pe
+	(cd $(outdir) && fontforge -script $(notdir $<)) 
+
+$(outdir)/%.otf-table: $(outdir)/%.lisp
+	cat $< $(subst parmesan,feta,$<) > $@
+
+
+
+$(PE_SCRIPTS):
+	$(PYTHON) $(buildscript-dir)/gen-bigcheese-scripts.py --dir=$(outdir)
+
+include $(outdir)/bigcheese20.dep
+
 
+foo:
+	echo $(CHEESES)
 ## use separate package sauter-fonts-mftraced.
 SAUTER_FONTS = 
 
@@ -64,7 +86,7 @@ PFB_FILES = $(PFA_FILES:%.pfa=%.pfb)
 
 # 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) $(FETA_LIST_FILES) $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale $(outdir)/Fontmap.lily
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES)  $(OTF_TABLES) $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale $(outdir)/Fontmap.lily $(CHEESES)
 
 #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
@@ -95,7 +117,7 @@ INSTALLATION_OUT_FILES7=$(ENC_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 
-default: pfa_warning $(ALL_GEN_FILES)
+default: pfa_warning $(ALL_GEN_FILES) $(outdir)/bigcheese20.otf
 
 
 pfa_warning:
@@ -143,8 +165,8 @@ get-pfa: get-rpm-pfa
 
 ##
 ## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
-	$(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) $<
+$(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
+	$(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) --lisp=$(outdir)/$(<F:.log=.lisp) --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) $<
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily)