+2006-02-26 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * 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 <nicolas.sceaux@free.fr>
* scm/markup.scm (define-markup-command): change
2006-02-25 Han-Wen Nienhuys <hanwen@xs4all.nl>
* 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.
(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
@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
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)
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)\
$(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' > $@
$(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
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
Generate("aybabtu.otf");
Generate("aybabtu.svg");
-SetFontNames("PFAAybabtu-Regular", "PFAAybabtu", "PFAAybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
-Generate("PFAaybabtu.pfa");
(/ 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
(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))
(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))))
(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 ")))
(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)
"")))))
(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))