X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;fp=mf%2FGNUmakefile;h=c47b2697d359dcc63e775d5af6802887a82dcbd4;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=389f7b9baf88a3720e8e0f23ebf6a4ea929539ab;hpb=5a22d6233a39d3164e1ca043244794c268be4ad0;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 389f7b9baf..c47b2697d3 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -16,20 +16,22 @@ EXTRA_DIST_FILES += README mf2pt1.mp
 FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf) \
 		$(call src-wildcard,feta-braces-[a-z].mf) \
 		$(call src-wildcard,feta-alphabet*[0-9].mf) \
+		$(call src-wildcard,feta-notehead*[0-9].mf) \
 		$(call src-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
 
 OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \
-	    $(outdir)/aybabtu.otf
+	    $(outdir)/emmentaler-brace.otf
 PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)
 OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
 	     $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg)
+WOFF_FILES = $(OTF_FILES:%.otf=%.woff)
 
-FC_FIND = $(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' \
+FC_FIND = $(shell $(FCLIST) --verbose 'Century Schoolbook L:style=$(1)' \
 		  | grep 'file:' \
 		  | sed 's/.*"\([^"]*\)".*/\1/g')
 
@@ -44,10 +46,10 @@ LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
 ENC_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.enc)
 TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
 
-$(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
+$(outdir)/emmentaler-brace.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 	cat $^ > $@
 
-$(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
+$(outdir)/emmentaler-brace.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 	echo '(design_size . 20)' > $@
 
 
@@ -58,66 +60,79 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 # 2. are not included with teTeX
 #
 
-$(outdir)/emmentaler-%.otf \
-$(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe \
+$(outdir)/emmentaler-%.otf\
+ $(outdir)/emmentaler-%.svg\
+ $(outdir)/emmentaler-%.woff: $(outdir)/emmentaler-%.pe \
 			    $(outdir)/feta%.pfb \
+			    $(outdir)/feta-noteheads%.pfb \
 			    $(outdir)/feta-alphabet%.pfb \
 			    $(outdir)/parmesan%.pfb \
 			    $(outdir)/feta%.otf-table \
 			    $(outdir)/feta%.otf-gtable
 	cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe)
 
-$(outdir)/aybabtu.otf \
-$(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe \
+$(outdir)/emmentaler-brace.otf\
+ $(outdir)/emmentaler-brace.svg\
+ $(outdir)/emmentaler-brace.woff: $(outdir)/emmentaler-brace.pe \
 		       $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) \
-		       $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
-	cd $(outdir) && $(FONTFORGE) -script aybabtu.pe
+		       $(outdir)/emmentaler-brace.otf-table $(outdir)/emmentaler-brace.otf-gtable
+	cd $(outdir) && $(FONTFORGE) -script emmentaler-brace.pe
 
 $(outdir)/%.pfb: $(outdir)/%.log
 
 $(outdir)/%.otf-table: $(outdir)/%.lisp
 	cat $< $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
+	       $(if $(findstring brace,$<),,$(subst feta,feta-noteheads,$<)) \
 	       $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
 
 
 ## ugh -- we want this to prevent failing -j2 compiles.
 $(outdir)/feta26.otf-table: $(outdir)/feta26.lisp \
+			    $(outdir)/feta-noteheads26.lisp \
 			    $(outdir)/parmesan26.lisp \
 			    $(outdir)/feta-alphabet26.lisp
 $(outdir)/feta23.otf-table: $(outdir)/feta23.lisp \
+			    $(outdir)/feta-noteheads23.lisp \
 			    $(outdir)/parmesan23.lisp \
 			    $(outdir)/feta-alphabet23.lisp
 $(outdir)/feta20.otf-table: $(outdir)/feta20.lisp \
+			    $(outdir)/feta-noteheads20.lisp \
 			    $(outdir)/parmesan20.lisp \
 			    $(outdir)/feta-alphabet20.lisp
 $(outdir)/feta18.otf-table: $(outdir)/feta18.lisp \
+			    $(outdir)/feta-noteheads18.lisp \
 			    $(outdir)/parmesan18.lisp \
 			    $(outdir)/feta-alphabet18.lisp
 $(outdir)/feta16.otf-table: $(outdir)/feta16.lisp \
+			    $(outdir)/feta-noteheads16.lisp \
 			    $(outdir)/parmesan16.lisp \
 			    $(outdir)/feta-alphabet16.lisp
 $(outdir)/feta14.otf-table: $(outdir)/feta14.lisp \
+			    $(outdir)/feta-noteheads14.lisp \
 			    $(outdir)/parmesan14.lisp \
 			    $(outdir)/feta-alphabet14.lisp
 $(outdir)/feta13.otf-table: $(outdir)/feta13.lisp \
+			    $(outdir)/feta-noteheads13.lisp \
 			    $(outdir)/parmesan13.lisp \
 			    $(outdir)/feta-alphabet13.lisp
 $(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \
+			    $(outdir)/feta-noteheads11.lisp \
 			    $(outdir)/parmesan11.lisp \
 			    $(outdir)/feta-alphabet11.lisp
 
-$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts \
-		       $(outdir)/aybabtu.fontname \
-		       $(outdir)/aybabtu.otf-table \
-		       $(outdir)/aybabtu.otf-gtable \
-		       $(outdir)/aybabtu.pe
+$(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \
+				$(outdir)/emmentaler-brace.fontname \
+				$(outdir)/emmentaler-brace.otf-table \
+				$(outdir)/emmentaler-brace.otf-gtable \
+				$(outdir)/emmentaler-brace.pe
 
-$(outdir)/aybabtu.otf \
-$(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
+$(outdir)/emmentaler-brace.otf\
+ $(outdir)/emmentaler-brace.svg\
+ $(outdir)/emmentaler-brace.woff: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
 
-$(outdir)/aybabtu.fontname:
-	echo -n 'aybabtu' > $@
-$(outdir)/aybabtu.subfonts:
+$(outdir)/emmentaler-brace.fontname:
+	echo -n 'emmentaler-brace' > $@
+$(outdir)/emmentaler-brace.subfonts:
 	echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
 $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts
@@ -126,6 +141,9 @@ $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts
 ALL_FONTS = $(FETA_FONTS)
 PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
 
+.PRECIOUS: $(PFB_FILES)
+
+
 # Make tfm files first, log files last,
 # so that normally log files aren't made twice
 ALL_GEN_FILES = $(LOG_FILES) \
@@ -133,9 +151,9 @@ ALL_GEN_FILES = $(LOG_FILES) \
 		$(LISP_FILES) \
 		$(OTF_TABLES) \
 		$(NCSB_OTFS) \
-		$(PFB_FILES) \
 		$(OTF_FILES) \
-		$(SVG_FILES)
+		$(SVG_FILES) \
+		$(WOFF_FILES)
 
 # PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
@@ -149,15 +167,12 @@ INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
 			  $(NCSB_OTFS)
 
 INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
-INSTALLATION_OUT_FILES2 = $(SVG_FILES)
-
-INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts/type1
-INSTALLATION_OUT_FILES3 = $(PFB_FILES)
+INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES)
 
 export MFINPUTS := .:$(MFINPUTS)
 
 
-default: $(ALL_GEN_FILES) \
+default: $(PFB_FILES) $(ALL_GEN_FILES) \
 	 $(outdir)/emmentaler-20.otf \
 	 tree-regen \
 	 $(outdir)/fonts.conf