(munge-lily-font-name): new function

(write-preamble): hack: insert PFA equivalent of CFF into
.PS. This makes LilyPond output printable on normal PS printers
again.

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 3f4ab66c0cb8929db151ee7630f6840475cec649..bd4e0ab3e69a6e20c7f2c7e908329329220227a2 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -56,7 +56,7 @@ MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) --no-afm
 # 2. are not included with teTeX
 #
 
-$(outdir)/%.cff.ps $(outdir)/%.cff $(outdir)/%.otf $(outdir)/%.svg: $(outdir)/%.pe
+$(outdir)/%.cff.ps $(outdir)/PFA%.pfa $(outdir)/%.cff $(outdir)/%.otf $(outdir)/%.svg: $(outdir)/%.pe
        (cd $(outdir) && $(FONTFORGE) -script $(notdir $<))
        $(PYTHON) $(buildscript-dir)/ps-embed-cff.py $(basename $<).cff `cat $(basename $<).fontname` $(basename $<).cff.ps
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index ecc78b5e477cb1e6ff9ab6a84d83878fd73246eb..23cb0841c23df989174f0cda1d1c699d5bf43584 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -144,7 +144,7 @@
   (define (extract-names font)
     (if (ly:pango-font? font)
        (map car (ly:pango-font-physical-fonts font))
-       (list (ly:font-name font))))
+       (list (munge-lily-font-name (ly:font-name font)))))
   
   (let* ((fonts (ly:paper-fonts paper))
         (names (apply append (map extract-names fonts)))