From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 7 Apr 2005 21:48:25 +0000 (+0000)
Subject: (lilypond.map): Add PFAEmmentaler,
X-Git-Tag: release/2.5.19~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ece11a294a0b8b29e9f275561023656bfa8b7af9;p=lilypond.git

(lilypond.map): Add PFAEmmentaler,
PFAAybabtu-Regular.  Fixes feta font in PDFs.
---

diff --git a/ChangeLog b/ChangeLog
index e8a8d7830a..24576f549e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,15 @@
 	* Documentation/topdocs/NEWS.tely (Top): Make tex-able.  Handy
 	test for PDF docs.
 
-	* mf/GNUmakefile (lilypond.map): Add PFAEmmentaler.  Fixes feta
-	font in PDFs.
+	* mf/GNUmakefile (lilypond.map): Add PFAEmmentaler,
+	PFAAybabtu-Regular.  Fixes feta font in PDFs.
+	
+	Notes for tetex-3.0 make web:
+	   psclean.map: s/uhv8a/uhvr8a/
+	   config.ps add:
+		p +psfonts_t1.map
+		p +psclean.map
+		p +typeface.map
 
 2005-04-06  Nicolas Sceaux  <nicolas.sceaux@free.fr>
 
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index e6bda84e44..9f48469895 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -123,7 +123,13 @@ INSTALLATION_OUT_FILES9=$(SVG_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 
-default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf
+.PHONY: tree-regen
+# FIXME: temporary hack: must regenerate after building fonts
+tree-regen:
+	rm -rf $(builddir)/share
+	make -C $(builddir) link-tree
+
+default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
 
 pfa_warning:
 ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace)
@@ -176,15 +182,20 @@ $(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc  $(outdir)/%.tex $(outdi
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily)
 
 
-$(outdir)/lilypond.map:
+$(outdir)/lilypond.map: GNUmakefile
 	for i in $(FETA_FONTS); do echo $$i $$i '<'$$i.pfa; done > $@
 	for i in $(STAFF_SIZES); do\
 		echo "Emmentaler-$$i Emmentaler-$$i <emmentaler-$$i.cff.ps";\
 		echo "PFAEmmentaler-$$i PFAEmmentaler-$$i <PFAemmentaler-$$i.pfa";\
  	done >> $@
 	echo "Aybabtu-Regular Aybabtu-Regular <aybabtu.cff.ps" >> $@
-
-$(outdir)/Fontmap.lily: 
+	echo "PFAAybabtu-Regular PFAAybabtu-Regular <aybabtu.cff.ps" >> $@
+#
+# FIXME: needed for make web on Debian/unstable -- not in any other .map file	
+	echo "FreeSans FreeSans <FreeSans.ttf" >> $@
+	echo "Kochi-Gothic Kochi-Gothic <kochi-gothic.ttf" >> $@
+	
+$(outdir)/Fontmap.lily: GNUmakefile
 	for i in $(FETA_FONTS); do echo "/$$i ($$i.pfa);" ; done > $@
 	for i in $(STAFF_SIZES); \
 		do echo "/Emmentaler-$$i (emmentaler-$$i.cff.ps);" ; done \