* lily/pango-font.cc (pango_item_string_stencil): add support for

CID keyed font.

* scm/output-ps.scm (glyph-string): add support for CID keyed font.

diff --git a/ChangeLog b/ChangeLog
index 869bf4e406145a27ebe3d96aea187e0c68d47509..7746df401632825f2d1760f9ee02b401ecc4ac64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/pango-font.cc (pango_item_string_stencil): add support for
+       CID keyed font.
+
+       * scm/output-ps.scm (glyph-string): add support for CID keyed font.
+
 2005-05-10  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/basic-notation.itely: add @ref.

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 8af090c106b64cb5e9ee5b2d78ed89ba3c02392b..de7b835ab85f47e9b1065c83512fb0f30068f956 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -110,9 +110,21 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con
       PangoGlyphGeometry ggeo = pgi->geometry;
 
       FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN);
+
+
+      SCM char_id; 
+      if (glyph_name[0] == '\0')
+       {
+         /*
+           CID entry
+          */
+         char_id = scm_from_int (pg);
+       }
+      else
+       char_id = scm_makfrom0str (glyph_name);
       *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_ + dx),
                                    scm_from_double (ggeo.y_offset * scale_),
-                                   scm_makfrom0str (glyph_name)),
+                                   char_id),
                        SCM_EOL);
       dx = 0.0;
       tail = SCM_CDRLOC (*tail);

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 7d5ed56e9acb4bd3e3c92e45d915ac4b33167555..aa6581adf47d78a3cd1fe2c8feb5b1f23d1be3c5 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -190,8 +190,10 @@
            (if (and (= 0.0 x)
                     (= 0.0 y))
                (format #f " /~a glyphshow\n" g)
-               (format #f " ~a ~a rmoveto /~a glyphshow\n"
-                       x y g))))
+               (format #f " ~a ~a rmoveto ~a~a glyphshow\n"
+                       x y
+                       (if  (string? g) "/" "")
+                       g))))
        x-y-named-glyphs))))
 
 (define (grob-cause offset grob)