From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 18 Dec 2004 18:50:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.14~389
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3bff0e5d144fdaf8cb08d7d77d1da74ea1d6a7e6;p=lilypond.git

*** empty log message ***
---

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b01bb1cff0..9fd5bed79e 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -166,38 +166,44 @@ $(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)
 
-## Urg
-mapentry=$(1) $(shell fgrep FontName $(outdir)/$(1).afm | sed -e 's/FontName *//') <$(1).pfaX
+### Urg
+#mapentry=$(1) $(shell fgrep FontName $(outdir)/$(1).afm | sed -e 's/FontName *//') <$(1).pfaX
+#
+#map = $(foreach a,$(2),$(call $(1),$(a)))
+#$(outdir)/lilypond.xmap: $(AFM_FILES)
+#	echo '$(call map,mapentry,$(ALL_FONTS))' | \
+#		tr 'X' '\n' | sed -e 's/^ *//'> $@
+#
+## using shell for loop seems most robust
+#$(outdir)/lilypond.map: $(AFM_FILES)
+#	for i in $(FETA_FONTS); do echo $$i $$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') '<'$$i.pfa; done > $@
+#
+#$(outdir)/Fontmap:
+#	echo '%!' > $@
+#	echo '% Override default GS Fontmap' >> $@
+#	echo '% To let gs load fonts from builddir, do:' >> $@
+#	echo '% export GS_LIB=$$(pwd)/mf/out:' >> $@
+#	echo '% See Fontmap.GS for the syntax of real Fontmap files.' >> $@
+#	echo '(Fontmap.GS) .runlibfile' >> $@
+#	echo '(Fontmap.lily) .runlibfile' >> $@
+#
+#$(outdir)/Fontmap.lily: $(AFM_FILES) $(outdir)/Fontmap
+#	echo '%!' > $@
+#	for i in $(FETA_FONTS); do echo "/$$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') ($$i.pfa);"; done >> $@
+#
+#
+#$(outdir)/fonts.scale: $(PFA_FILES)
+##	cd $(outdir) && echo $(FETA_MF_FILES:.mf=.pfa) $(FETA_MF_FILES:.mf=.pfb) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)
+#	cd $(outdir) && echo *.pfa *.pfb | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)
+#
+#$(outdir)/fonts.dir: $(outdir)/fonts.scale
+#	cd $(outdir) && mkfontdir
+#
 
-map = $(foreach a,$(2),$(call $(1),$(a)))
-$(outdir)/lilypond.xmap: $(AFM_FILES)
-	echo '$(call map,mapentry,$(ALL_FONTS))' | \
-		tr 'X' '\n' | sed -e 's/^ *//'> $@
 
-# using shell for loop seems most robust
 $(outdir)/lilypond.map: $(AFM_FILES)
-	for i in $(FETA_FONTS); do echo $$i $$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') '<'$$i.pfa; done > $@
-
-$(outdir)/Fontmap:
-	echo '%!' > $@
-	echo '% Override default GS Fontmap' >> $@
-	echo '% To let gs load fonts from builddir, do:' >> $@
-	echo '% export GS_LIB=$$(pwd)/mf/out:' >> $@
-	echo '% See Fontmap.GS for the syntax of real Fontmap files.' >> $@
-	echo '(Fontmap.GS) .runlibfile' >> $@
-	echo '(Fontmap.lily) .runlibfile' >> $@
-
-$(outdir)/Fontmap.lily: $(AFM_FILES) $(outdir)/Fontmap
-	echo '%!' > $@
-	for i in $(FETA_FONTS); do echo "/$$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') ($$i.pfa);"; done >> $@
-
-
-$(outdir)/fonts.scale: $(PFA_FILES)
-#	cd $(outdir) && echo $(FETA_MF_FILES:.mf=.pfa) $(FETA_MF_FILES:.mf=.pfb) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)
-	cd $(outdir) && echo *.pfa *.pfb | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)
+	for i in $(FETA_FONTS); do echo $$i $$i'<'$$i.pfa; done > $@
 
-$(outdir)/fonts.dir: $(outdir)/fonts.scale
-	cd $(outdir) && mkfontdir
 
 local-clean:
 	rm -f mfplain.mem mfplain.log 
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index a7a61125b8..ade34dcba0 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -91,7 +91,7 @@
 		     (a-file-name (ly:gulp-file a-file-name))
 		     (b-file-name (ly:pfb->pfa b-file-name))
 		     (else
-		      (ly:warn "cannot find T42/PFA/PFB font ~S" x)
+		      (ly:warn "cannot find CFF/PFA/PFB font ~S" x)
 		      ""))))
 		(filter string? font-names))))