*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 9a71ac8e8e9fe079fc0026f609c9bec06abea1f1..778ea83b558c95f93fedc2b57613b84fc0a8d33b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 2006-05-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * mf/GNUmakefile: remove pfa download stuff.
+
        * stepmake/aclocal.m4: use python-config for x-compile flags. Backport.
 
        * scripts/lilypond-book.py (do_process_cmd): backport: create .png

diff --git a/buildscripts/pfx2ttf.fontforge b/buildscripts/pfx2ttf.fontforge
index 1c74f0ba12b1a01d5cbfb2919634adb12d5377c8..ec0f9a214abbb3ecb6f7f392e6e4da072fbe3bbf 100644 (file)
--- a/buildscripts/pfx2ttf.fontforge
+++ b/buildscripts/pfx2ttf.fontforge
@@ -13,5 +13,5 @@ elseif ( err < 0 )
    Print("An error occurred while searching for the \"numero\" glyph");
 endif
 
-Generate($3 + $fontname + ".ttf");
+Generate($3 + $fontname + ".otf");
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 3ac9576bb5f3155de39fa5c9da5a53034f9d369b..884475c8e1a54342d7857062279f64f99fbf3ada 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -31,7 +31,7 @@ FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
 
 
-NCSB_OTFS=$(addprefix $(outdir)/,CenturySchL-Ital.ttf CenturySchL-BoldItal.ttf CenturySchL-Roma.ttf CenturySchL-Bold.ttf)
+NCSB_OTFS=$(addsuffix .otf,$(addprefix $(outdir)/,CenturySchL-Ital CenturySchL-BoldItal CenturySchL-Roma CenturySchL-Bold))
 NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
@@ -128,7 +128,7 @@ export MFINPUTS:=.:$(MFINPUTS)
 
 
 
-default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
+default: $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
 
 .PHONY: tree-regen
 
@@ -136,49 +136,6 @@ default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen
 tree-regen:
        ${MAKE} -C $(top-build-dir) link-mf-tree
 
-pfa_warning:
-ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace)
-       @echo ""
-       @echo "ERROR: mftrace not found"
-       @echo ""
-       @echo "For obtaining PFA/SVG fonts, either install mftrace "
-       @echo "(see http://www.xs4all.nl/~hanwen/mftrace/ ),"
-       @echo "or try one of the following commands in this directory: "
-       @echo ""
-       @echo " make get-fonts "
-       @echo " make get-rpm-fonts "
-       @echo " make get-deb-fonts "
-       @echo ""
-       @echo "These commands will try to download the files from internet."
-       @false
-endif
-
-
-debian-mirror=http://ftp.us.debian.org
-debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb
-$(outdir)/$(debian-package):
-       wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package)
-
-get-deb-fonts: $(outdir)/$(debian-package)
-       rm -rf $(outdir)/./usr
-       ar p $< data.tar.gz | \
-               tar -C $(outdir) -zvxf - '*.pfa' '*.svg'
-       cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
-
-
-redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
-$(outdir)/$(redhat-package):
-       wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package)
-
-get-rpm-fonts: $(outdir)/$(redhat-package)
-       cd $(outdir) ; rm -rf usr/ # (root alert!)
-       cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg'
-       cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/
-
-# change this dependency
-get-fonts: get-rpm-fonts
-get-pfa: get-rpm-fonts
-
 
 ##
 ## todo: this also depends on .tfm, FIXME.
@@ -199,4 +156,4 @@ $(outdir)/%.enc.in: %.enc
 $(NCSB_OTFS): $(NCSB_SOURCE_FILES) $(buildscript-dir)/pfx2ttf.fontforge
        $(foreach i,$(NCSB_SOURCE_FILES), \
                $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
-       $(i).pfb $(i).afm $(outdir)/ && ) true
+       $(i) $(basename $(i)).afm $(outdir)/ && ) true