From 16e43eba320ff3a01604244772463c4b9a84cd2d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 25 Feb 2006 23:40:18 +0000 Subject: [PATCH] * mf/aybabtu.pe.in (i): remove PFAaybabtu generation * buildscripts/gen-emmentaler-scripts.py (i): remove PFAemmentaler generation * scm/framework-ps.scm: remove font name munging. * Documentation/topdocs/INSTALL.texi (Top): bump GS requirement. --- ChangeLog | 12 +++++++++++ Documentation/topdocs/INSTALL.texi | 7 ++++--- buildscripts/gen-emmentaler-scripts.py | 5 ----- mf/GNUmakefile | 11 ++++------ mf/aybabtu.pe.in | 2 -- scm/framework-ps.scm | 29 +++++++++----------------- 6 files changed, 30 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cc2cbaad7..01c1c9b699 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-02-26 Han-Wen Nienhuys + + * mf/aybabtu.pe.in (i): remove PFAaybabtu generation + + * buildscripts/gen-emmentaler-scripts.py (i): remove PFAemmentaler + generation + + * scm/framework-ps.scm: remove font name munging. + + * Documentation/topdocs/INSTALL.texi (Top): bump GS requirement. + 2006-02-25 Nicolas Sceaux * scm/markup.scm (define-markup-command): change @@ -21,6 +32,7 @@ 2006-02-25 Han-Wen Nienhuys * scripts/lilypond-book.py (main): write Makefile dependencies file. + (output): add comments to lp-book latex output. * GNUmakefile.in (footifymail): use gmane address for webpage bug address. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index f86661fa68..3b1e0904ab 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -125,7 +125,7 @@ software (version 1.6.5 or newer). @item @uref{http://www.python.org,Python} (version 2.1 or newer). @item @uref{http://www.ghostscript.com,Ghostscript} (version 8.15 or -newer) +newer. 8.50 recommended) @end itemize @subsection Building documentation @@ -147,9 +147,10 @@ Building the website requires some additional tools and packages @item ImageMagick @item International fonts (see input/regression/utf-8.ly for hints about which font packages are necessary for your platform) -@item Ghostscript, 8.15 with the patch from +@item Ghostscript, 8.50 with the patch from @uref{http://bugs.ghostscript.com/show_bug.cgi?id=688154} - +and the patch from +@uref{http://bugs.ghostscript.com/show_bug.cgi?id=688017}. @end itemize The HTML files can be installed into the standard documentation path diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py index b68855acb6..91afe6d1fb 100644 --- a/buildscripts/gen-emmentaler-scripts.py +++ b/buildscripts/gen-emmentaler-scripts.py @@ -75,11 +75,6 @@ LoadTableFromFile("LILY", "feta%(design_size)d.otf-gtable"); Generate("%(filename)s-%(design_size)d.otf"); Generate("%(filename)s-%(design_size)d.svg"); -SetFontNames("PFA%(name)s-%(design_size)d", "PFA%(name)s", "PFA%(name)s %(design_size)d", "%(design_size)d", notice, "@TOPLEVEL_VERSION@"); - -# different name to prevent conflict with OTF -#LoadEncodingFile("feta%(design_size)d.enc"); -Generate("PFA%(filename)s-%(design_size)d.pfa"); ''' % vars() basename = '%s-%d' % (filename, design_size) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index e03b6d8eb0..4a32c6b0ed 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -20,12 +20,9 @@ FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf)\ STAFF_SIZES = 11 13 14 16 18 20 23 26 BRACES = a b c d e f g h i -PFA_PREFIX = PFA OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf)\ $(outdir)/aybabtu.otf -PFA_OTF_FILES = $(STAFF_SIZES:%=$(outdir)/$(PFA_PREFIX)emmentaler-%.pfa)\ - $(outdir)/$(PFA_PREFIX)aybabtu.pfa PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)\ $(STAFF_SIZES:%=$(outdir)/emmentaler-%.dep) OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\ @@ -85,9 +82,9 @@ $(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst fet $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \ $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@ -$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe +$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe -$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa) +$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa) $(outdir)/aybabtu.fontname: echo -n 'aybabtu' > $@ @@ -97,7 +94,7 @@ $(outdir)/aybabtu.subfonts: $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py $(PYTHON) $< --dir=$(outdir) -$(outdir)/fonts.cache-1: $(PFA_OTF_FILES) $(PFA_FILES) $(OTF_FILES) +$(outdir)/fonts.cache-1: $(PFA_FILES) $(OTF_FILES) cd $(outdir) ; fc-cache . local-install: install-fc-cache @@ -107,7 +104,7 @@ install-fc-cache: fc-cache $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))) ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS) -PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES) +PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) # Make tfm files first, log files last, # so that normally log files aren't made twice diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in index 9072d30c0c..a4c542f386 100644 --- a/mf/aybabtu.pe.in +++ b/mf/aybabtu.pe.in @@ -82,5 +82,3 @@ LoadTableFromFile("LILY", "aybabtu.otf-gtable") Generate("aybabtu.otf"); Generate("aybabtu.svg"); -SetFontNames("PFAAybabtu-Regular", "PFAAybabtu", "PFAAybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@"); -Generate("PFAaybabtu.pfa"); diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index b7a308479f..8fd51ebfaf 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -28,7 +28,7 @@ (/ 72 25.4)) (define-public (ps-font-command font) - (let* ((name (munge-lily-font-name (ly:font-file-name font))) + (let* ((name (ly:font-file-name font)) (magnify (ly:font-magnification font))) (string-append @@ -55,7 +55,7 @@ (define (font-load-command font) (let* ((specced-font-name (ly:font-name font)) (fontname (if specced-font-name - (munge-lily-font-name specced-font-name) + specced-font-name (ly:font-file-name font))) (command (ps-font-command font)) @@ -132,7 +132,7 @@ (define (extract-names font) (if (ly:pango-font? font) (map car (ly:pango-font-physical-fonts font)) - (list (munge-lily-font-name (ly:font-name font))))) + (list (ly:font-name font)))) (let* ((fonts (ly:paper-fonts paper)) (names (apply append (map extract-names fonts)))) @@ -194,13 +194,6 @@ (output-variables paper) "%%EndSetup\n")) -(define-public (munge-lily-font-name name) - ;; FIXME: this fixes PFAPAFemmentaler.pfapfa, and also - ;; PFAaybabtu.otf.pfa, but the second case now produces aybabtu.otf, - ;; which still fails because .otf files cannot be embedded. - (regexp-substitute/global #f "^([eE]mmentaler|[aA]ybabtu)" - name 'pre "PFA" 1 'post)) - (define (cff-font? font) (let* ((cff-string (ly:otf-font-table-data font "CFF "))) @@ -254,13 +247,13 @@ (bare-file-name (ly:find-file file-name))) (cons - (munge-lily-font-name name) + name (cond - ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name) - (ps-load-file (ly:find-file - (format "~a.pfa" (munge-lily-font-name file-name))))) + ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name) + (ps-load-file (ly:find-file + (format "~a.otf" file-name)))) ((string? bare-file-name) - (ps-load-file (munge-lily-font-name file-name))) + (ps-load-file file-name)) (else (ly:warning (_ "can't embed ~S=~S") name file-name) ""))))) @@ -340,11 +333,9 @@ (bare-file-name (ly:find-file file-name))) (cons - (munge-lily-font-name name) + name (cond - ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name) - (cached-file-contents - (format "~a.pfa" (munge-lily-font-name file-name)))) + ((and (eq? PLATFORM 'darwin) bare-file-name (string-match "\\.dfont" bare-file-name)) -- 2.39.5