* scm/output-ps.scm (glyph-string): revert cid selectfont.

* scm/output-ps.scm: glyph-string now produces smaller, more
readable, and probably faster PostScript.  Several findfont
scalefont setfont instances changed to selectfont
Hacked-up string-appends changed to formats.
Patch by David Feuer.

diff --git a/ChangeLog b/ChangeLog
index 1752e475f4184595c90dfb54e4c88ad85c99b37f..25ef51986cc61ee14fb151e0961f139028d7d674 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-03-31  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scm/output-ps.scm (glyph-string): revert cid selectfont.
+
        * scm/framework-ps.scm:
        Patch by David Feuer.
        

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index fd0b768dd88aa7692f88b0c04b2c9652c2159def..eef37c63459aaf0bcf6fb66fac1abef4477b8648 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -143,8 +143,14 @@
                      cid?
                      w-x-y-named-glyphs)
 
-  (format #f "gsave \n/~a ~a output-scale div selectfont\n~a grestore"
+  (format #f "gsave
+  /~a ~a ~a output-scale div scalefont setfont\n~a grestore"
          postscript-font-name
+
+         ;; with normal findfont, GS throws /typecheck for glyphshow.
+         (if cid?
+             " /CIDFont findresource "
+             " findfont")
          size
          (string-append
            (apply