[cairo-commit] 2 commits - src/cairo-scaled-font-subsets.c test/ft-show-glyphs-positioning.pdf.ref.png

[Adrian Johnson]

 src/cairo-scaled-font-subsets.c             |    9 +++++++--
 test/ft-show-glyphs-positioning.pdf.ref.png |binary
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit dd96c4accb546870b7bf7db4af10c2762de58d78
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Oct 8 23:05:42 2010 +1030

    Refresh ft-show-glyphs-positioning pdf ref image
    
    The new image is more accurate as a result of the fix in 165a14b5

diff --git a/test/ft-show-glyphs-positioning.pdf.ref.png b/test/ft-show-glyphs-positioning.pdf.ref.png
index 796d4eb..0d62fd3 100644
Binary files a/test/ft-show-glyphs-positioning.pdf.ref.png and b/test/ft-show-glyphs-positioning.pdf.ref.png differ
commit a0b208fc71db586d3793fa4e2f4c01b275608261
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Oct 8 23:01:12 2010 +1030

    Don't put Type3 glyphs in latin subsets
    
    it is not yet implemented

diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 7bc42f8..f5e6dec 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -298,8 +298,13 @@ _cairo_sub_font_create (cairo_scaled_font_subsets_t	*parent,
     sub_font->font_id = font_id;
 
     sub_font->use_latin_subset = parent->use_latin_subset;
-    if (_cairo_cff_scaled_font_is_cid_cff (scaled_font))
-	sub_font->use_latin_subset = FALSE; /* latin subsets of CID CFF fonts are not supported */
+
+    /* latin subsets of Type 3 and CID CFF fonts are not supported */
+    if (sub_font->is_user || sub_font->is_scaled ||
+	_cairo_cff_scaled_font_is_cid_cff (scaled_font) )
+    {
+	sub_font->use_latin_subset = FALSE;
+    }
 
     if (sub_font->use_latin_subset)
 	sub_font->current_subset = 1; /* reserve subset 0 for latin glyphs */