CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/10 18:40:44
Modified files:
. : ChangeLog
lily : pango-font.cc
scm : output-ps.scm
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3588&tr2=1.3589&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/pango-font.cc.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.136&tr2=1.137&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3588 lilypond/ChangeLog:1.3589
--- lilypond/ChangeLog:1.3588 Tue May 10 12:58:03 2005
+++ lilypond/ChangeLog Tue May 10 18:40:43 2005
@@ -1,3 +1,10 @@
+2005-05-10 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* Documentation/user/basic-notation.itely: add @ref.
Index: lilypond/lily/pango-font.cc
diff -u lilypond/lily/pango-font.cc:1.31 lilypond/lily/pango-font.cc:1.32
--- lilypond/lily/pango-font.cc:1.31 Thu May 5 22:13:58 2005
+++ lilypond/lily/pango-font.cc Tue May 10 18:40:44 2005
@@ -110,9 +110,21 @@
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);
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.136 lilypond/scm/output-ps.scm:1.137
--- lilypond/scm/output-ps.scm:1.136 Tue May 3 22:22:56 2005
+++ lilypond/scm/output-ps.scm Tue May 10 18:40:44 2005
@@ -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)
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
