* lily/dots.cc (print): replace -

[lilypond.git] / mf / GNUmakefile

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 1e35e0ca9f3156303606436b159102a76e8bb581..2ad3b6b4be80f8caf5f87935d7555bf93bd5e077 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -6,18 +6,23 @@ include $(depth)/make/stepmake.make
 
 AF_FILES = $(wildcard *.af) 
 
-EXTRA_DIST_FILES += README feta.tex cmr.enc
+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
+
+CHEESES=$(addsuffix .otf,$(addprefix $(outdir)/bigcheese,$(STAFF_SIZES)))
+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)))
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
 
-XPM_FONTS = feta20 feta-din10 feta-nummer10 feta-braces20 parmesan20
+
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 TEXTABLES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tex)
@@ -30,8 +35,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
 #
@@ -40,9 +43,32 @@ bla:
 # 2. are not included with teTeX
 #
 
+foe:
+       echo $(MFINPUTS)
+       echo $(TEXMF)
+       kpsewhich exbase.mf
+
+$(outdir)/feta20.otf-table:
+       cat $(outdir)/feta20.lisp $(outdir)/parmesan20.lisp > $@
+
+$(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 = ecb10
+SAUTER_FONTS = 
 
 #cmbxti8 ecbm14 ecrm12
 MORE_SAUTER_FONTS = cmbx14 cmbx17 \
@@ -59,7 +85,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) $(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
@@ -90,7 +116,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:
@@ -120,18 +146,16 @@ get-deb-pfa: $(outdir)/$(debian-package)
        rm -rf $(outdir)/./usr
        ar p $< data.tar.gz | \
                tar -C $(outdir) -zvxf - '*.pfa'
-       touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS)))
        cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
 
 
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
-       wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-1/$(redhat-package)
+       wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-3/$(redhat-package)
 
 get-rpm-pfa: $(outdir)/$(redhat-package)
        cd $(outdir) ; rm -rf usr/ # (root alert!) 
        cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa'
-       touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS)))
        cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/
 
 # change this dependency 
@@ -141,7 +165,7 @@ 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) $<
+       $(PYTHON) $(buildscript-dir)/mf-to-table.py --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)
 
@@ -207,5 +231,5 @@ $(SAUTER_FONTS:%=$(outdir)/%.bla):
 $(outdir)/%.pfa: $(outdir)/%.bla
        $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@))  && mv $(notdir $@) $(outdir)/
 
-$(outdir)/%.enc: %.enc
+$(outdir)/%.enc.in: %.enc
        cp $< $@