WebSVN – Kolibri OS – Diff – /programs/develop/libraries/cairo/src/cairo-cff-subset.c

+/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
 /* cairo - a vector graphics library with display and print output
+ *
  * Copyright © 2006 Adrian Johnson
+ *
  * This library is free software; you can redistribute it and/or
  *      Eugeniy Meshcheryakov
  */
 /*
  * Useful links:
+ * http://www.adobe.com/content/dam/Adobe/en/devnet/font/pdfs/5176.CFF.pdf
- * http://www.adobe.com/devnet/font/pdfs/5176.CFF.pdf
+ * http://www.adobe.com/content/dam/Adobe/en/devnet/font/pdfs/5177.Type2.pdf
  */
+#define _BSD_SOURCE /* for snprintf(), strdup() */
+#include "cairoint.h"
 #define _BSD_SOURCE /* for snprintf(), strdup() */
-#include "cairoint.h"
+#include "cairo-array-private.h"
 #include "cairo-error-private.h"
 #if CAIRO_HAS_FONT_SUBSET
 #include "cairo-scaled-font-subsets-private.h"
-#include "cairo-scaled-font-subsets-private.h"
+#include "cairo-truetype-subset-private.h"
-#include "cairo-truetype-subset-private.h"
+#include
 #include
 /* CFF Dict Operators. If the high byte is 0 the command is encoded
  * with a single byte. */
+#define BASEFONTNAME_OP  0x0c16
-#define BASEFONTNAME_OP  0x0c16
+#define CIDCOUNT_OP      0x0c22
-#define CIDCOUNT_OP      0x0c22
+#define CHARSET_OP       0x000f
-#define CHARSET_OP       0x000f
+#define CHARSTRINGS_OP   0x0011
-#define CHARSTRINGS_OP   0x0011
+#define COPYRIGHT_OP     0x0c00
-#define COPYRIGHT_OP     0x0c00
+#define DEFAULTWIDTH_OP  0x0014
+#define ENCODING_OP      0x0010
-#define ENCODING_OP      0x0010
+#define FAMILYNAME_OP    0x0003
-#define FAMILYNAME_OP    0x0003
+#define FDARRAY_OP       0x0c24
-#define FDARRAY_OP       0x0c24
+#define FDSELECT_OP      0x0c25
+#define FONTBBOX_OP      0x0005
-#define FDSELECT_OP      0x0c25
+#define FONTMATRIX_OP    0x0c07
-#define FONTBBOX_OP      0x0005
+#define FONTNAME_OP      0x0c26
-#define FONTNAME_OP      0x0c26
+#define FULLNAME_OP      0x0002
-#define FULLNAME_OP      0x0002
+#define LOCAL_SUB_OP     0x0013
-#define LOCAL_SUB_OP     0x0013
+#define NOMINALWIDTH_OP  0x0015
 #define WEIGHT_OP        0x0004
 #define XUID_OP          0x000e
+#define NUM_STD_STRINGS 391
+/* Type 2 Charstring operators */
+#define TYPE2_hstem     0x0001
+#define TYPE2_vstem     0x0003
+#define TYPE2_callsubr  0x000a
+#define TYPE2_return    0x000b
+#define TYPE2_endchar   0x000e
+#define TYPE2_hstemhm   0x0012
+#define TYPE2_hintmask  0x0013
+#define TYPE2_cntrmask  0x0014
+#define TYPE2_vstemhm   0x0017
+#define TYPE2_callgsubr 0x001d
+#define TYPE2_rmoveto   0x0015
+#define TYPE2_hmoveto   0x0016
+#define TYPE2_vmoveto   0x0004
+#define MAX_SUBROUTINE_NESTING 10 /* From Type2 Charstring spec */
 #define NUM_STD_STRINGS 391
 typedef struct _cff_header {
     uint8_t major;
     uint8_t minor;
     cairo_hash_table_t  *private_dict;
     cairo_array_t        strings_index;
     cairo_array_t        charstrings_index;
     cairo_array_t        global_sub_index;
     cairo_array_t        local_sub_index;
+    unsigned char       *charset;
     int                  num_glyphs;
     cairo_bool_t         is_cid;
+    cairo_bool_t         is_opentype;
     int  		 units_per_em;
+    int 		 global_sub_bias;
+    int			 local_sub_bias;
+    double               default_width;
+    double               nominal_width;
     /* CID Font Data */
     int                 *fdselect;
     unsigned int         num_fontdicts;
     cairo_hash_table_t **fd_dict;
     cairo_hash_table_t **fd_private_dict;
+    cairo_array_t       *fd_local_sub_index;
+    int			*fd_local_sub_bias;
+    double              *fd_default_width;
-    cairo_array_t       *fd_local_sub_index;
+    double              *fd_nominal_width;
     /* Subsetted Font Data */
     char                *subset_font_name;
+    cairo_array_t        charstrings_subset_index;
-    cairo_array_t        charstrings_subset_index;
+    cairo_array_t        strings_subset_index;
-    cairo_array_t        strings_subset_index;
+    int			 euro_sid;
     int                 *fdselect_subset;
     unsigned int         num_subset_fontdicts;
+    int                 *fd_subset_map;
+    int                 *private_dict_offset;
+    cairo_bool_t         subset_subroutines;
+    cairo_bool_t	*global_subs_used;
-    int                 *fd_subset_map;
+    cairo_bool_t	*local_subs_used;
-    int                 *private_dict_offset;
+    cairo_bool_t       **fd_local_subs_used;
     cairo_array_t        output;
     /* Subset Metrics */
+    int                 *widths;
+    int                  x_min, y_min, x_max, y_max;
+    int                  ascent, descent;
+    /* Type 2 charstring data */
+    int 	 	 type2_stack_size;
+    int 		 type2_stack_top_value;
+    cairo_bool_t 	 type2_stack_top_is_int;
+    int 		 type2_num_hints;
+    int 		 type2_hintmask_bytes;
+    int                  type2_nesting_level;
+    cairo_bool_t         type2_seen_first_int;
+    cairo_bool_t         type2_find_width;
-    int                 *widths;
+    cairo_bool_t         type2_found_width;
-    int                  x_min, y_min, x_max, y_max;
+    int                  type2_width;
-    int                  ascent, descent;
+    cairo_bool_t         type2_has_path;
         p += 1;
+    }
     return p;
+}
+static char *
+decode_nibble (int n, char *buf)
+{
+    switch (n)
+    {
+    case 0xa:
+	*buf++ = '.';
+	break;
+    case 0xb:
+	*buf++ = 'E';
+	break;
+    case 0xc:
+	*buf++ = 'E';
+	*buf++ = '-';
+	break;
+    case 0xd:
+	*buf++ = '-';
+	break;
+    case 0xe:
+	*buf++ = '-';
+	break;
+    case 0xf:
+	break;
+    default:
+	*buf++ = '0' + n;
+	break;
+    }
+    return buf;
+}
+static unsigned char *
+decode_real (unsigned char *p, double *real)
+{
+    struct lconv *locale_data;
+    const char *decimal_point;
+    int decimal_point_len;
+    int n;
+    char buffer[100];
+    char buffer2[200];
+    char *q;
+    char *buf = buffer;
+    char *buf_end = buffer + sizeof (buffer);
+    locale_data = localeconv ();
+    decimal_point = locale_data->decimal_point;
+    decimal_point_len = strlen (decimal_point);
+    assert (decimal_point_len != 0);
+    assert (sizeof(buffer) + decimal_point_len < sizeof(buffer2));
+    p++;
+    while (buf + 2 < buf_end) {
+	n = *p >> 4;
+	buf = decode_nibble (n, buf);
+	n = *p & 0x0f;
+	buf = decode_nibble (n, buf);
+        if ((*p & 0x0f) == 0x0f) {
+	    p++;
+            break;
+	}
+	p++;
+    };
+    *buf = 0;
+    buf = buffer;
+    if (strchr (buffer, '.')) {
+	 q = strchr (buffer, '.');
+	 strncpy (buffer2, buffer, q - buffer);
+	 buf = buffer2 + (q - buffer);
+	 strncpy (buf, decimal_point, decimal_point_len);
+	 buf += decimal_point_len;
+	 strcpy (buf, q + 1);
+	 buf = buffer2;
+    }
+    if (sscanf(buf, "%lf", real) != 1)
+        *real = 0.0;
+    return p;
+}
+static unsigned char *
+decode_number (unsigned char *p, double *number)
+{
+    if (*p == 30) {
+        p = decode_real (p, number);
+    } else {
+        int i;
+        p = decode_integer (p, &i);
+        *number = i;
+    }
+    return p;
+}
 static unsigned char *
 decode_operator (unsigned char *p, unsigned short *operator)
+{
             return status;
+    }
     for (i = 0; i < num_elem; i++) {
+        element = _cairo_array_index (index, i);
-        element = _cairo_array_index (index, i);
+        if (element->length > 0) {
-        status = _cairo_array_append_multiple (output,
+            status = _cairo_array_append_multiple (output,
-                                               element->data,
+                                                   element->data,
+                                                   element->length);
                                                element->length);
         if (unlikely (status))
             return status;
+    }
     return CAIRO_STATUS_SUCCESS;
+}
+static void
+cff_index_set_object (cairo_array_t *index, int obj_index,
+                      unsigned char *object , int length)
+{
+    cff_index_element_t *element;
+    element = _cairo_array_index (index, obj_index);
+    if (element->is_copy)
+        free (element->data);
+    element->data = object;
+    element->length = length;
+    element->is_copy = FALSE;
+}
 static cairo_status_t
 cff_index_append (cairo_array_t *index, unsigned char *object , int length)
 static void
 cff_index_fini (cairo_array_t *index)
+{
     cff_index_element_t *element;
-    int i;
+    unsigned int i;
     for (i = 0; i < _cairo_array_num_elements (index); i++) {
         element = _cairo_array_index (index, i);
-        if (element->is_copy)
+        if (element->is_copy && element->data)
             free (element->data);
+    }
 cairo_cff_font_read_header (cairo_cff_font_t *font)
+{
     if (font->data_length < sizeof (cff_header_t))
         return CAIRO_INT_STATUS_UNSUPPORTED;
     font->header = (cff_header_t *) font->data;
     font->current_ptr = font->data + font->header->header_size;
 static cairo_int_status_t
 cairo_cff_font_read_name (cairo_cff_font_t *font)
+{
     cairo_array_t index;
     cairo_int_status_t status;
+    cff_index_element_t *element;
+    unsigned char *p;
+    int i, len;
-    /* The original font name is not used in the subset. Read the name
      * index to skip over it. */
     cff_index_init (&index);
+    status = cff_index_read (&index, &font->current_ptr, font->data_end);
+    if (!font->is_opentype) {
+        element = _cairo_array_index (&index, 0);
+	p = element->data;
+	len = element->length;
+	/* If font name is prefixed with a subset tag, strip it off. */
+	if (len > 7 && p[6] == '+') {
+	    for (i = 0; i < 6; i++)
+		if (p[i] < 'A' || p[i] > 'Z')
+		    break;
+	    if (i == 6) {
+		p += 7;
+		len -= 7;
+	    }
+	}
+        font->ps_name = malloc (len + 1);
+        if (unlikely (font->ps_name == NULL))
+            return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        memcpy (font->ps_name, p, len);
+        font->ps_name[len] = 0;
     status = cff_index_read (&index, &font->current_ptr, font->data_end);
     cff_index_fini (&index);
     return status;
+}
 static cairo_int_status_t
+cairo_cff_font_read_private_dict (cairo_cff_font_t   *font,
+                                  cairo_hash_table_t *private_dict,
+                                  cairo_array_t      *local_sub_index,
+                                  int                *local_sub_bias,
-cairo_cff_font_read_private_dict (cairo_cff_font_t   *font,
+                                  cairo_bool_t      **local_subs_used,
-                                  cairo_hash_table_t *private_dict,
+                                  double             *default_width,
-                                  cairo_array_t      *local_sub_index,
+                                  double             *nominal_width,
                                   unsigned char      *ptr,
                                   int                 size)
+{
     cairo_int_status_t status;
     unsigned char buf[10];
     unsigned char *end_buf;
     int offset;
+    int i;
-    int i;
+    unsigned char *operand;
-    unsigned char *operand;
+    unsigned char *p;
-    unsigned char *p;
+    int num_subs;
-        status = cff_dict_set_operands (private_dict, LOCAL_SUB_OP, buf, end_buf - buf);
+	status = cff_dict_set_operands (private_dict, LOCAL_SUB_OP, buf, end_buf - buf);
 	if (unlikely (status))
 	    return status;
+    }
+    *default_width = 0;
+    operand = cff_dict_get_operands (private_dict, DEFAULTWIDTH_OP, &i);
+    if (operand)
+        decode_number (operand, default_width);
+    *nominal_width = 0;
+    operand = cff_dict_get_operands (private_dict, NOMINALWIDTH_OP, &i);
+    if (operand)
+	 decode_number (operand, nominal_width);
+    num_subs = _cairo_array_num_elements (local_sub_index);
+    *local_subs_used = calloc (num_subs, sizeof (cairo_bool_t));
+    if (unlikely (*local_subs_used == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    if (num_subs < 1240)
+	*local_sub_bias = 107;
+    else if (num_subs < 33900)
+	*local_sub_bias = 1131;
+    else
+	*local_sub_bias = 32768;
     return CAIRO_STATUS_SUCCESS;
+}
     if (unlikely (font->fd_local_sub_index == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail;
+    }
+    font->fd_local_sub_bias = calloc (sizeof (int), font->num_fontdicts);
+    if (unlikely (font->fd_local_sub_bias == NULL)) {
+        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        goto fail;
+    }
+    font->fd_local_subs_used = calloc (sizeof (cairo_bool_t *), font->num_fontdicts);
+    if (unlikely (font->fd_local_subs_used == NULL)) {
+        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        goto fail;
+    }
+    font->fd_default_width = calloc (font->num_fontdicts, sizeof (double));
+    if (unlikely (font->fd_default_width == NULL)) {
+        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        goto fail;
+    }
+    font->fd_nominal_width = calloc (font->num_fontdicts, sizeof (double));
+    if (unlikely (font->fd_nominal_width == NULL)) {
+        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        goto fail;
+    }
     for (i = 0; i < font->num_fontdicts; i++) {
         status = cff_dict_init (&font->fd_dict[i]);
         if (unlikely (status))
         cff_index_init (&font->fd_local_sub_index[i]);
         status = cairo_cff_font_read_private_dict (font,
                                                    font->fd_private_dict[i],
+                                                   &font->fd_local_sub_index[i],
+                                                   &font->fd_local_sub_bias[i],
+                                                   &font->fd_local_subs_used[i],
+                                                   &font->fd_default_width[i],
-                                                   &font->fd_local_sub_index[i],
+                                                   &font->fd_nominal_width[i],
                                                    font->data + offset,
                                                    size);
         if (unlikely (status))
     cff_index_fini (&index);
     return status;
+}
+static void
+cairo_cff_font_read_font_metrics (cairo_cff_font_t *font, cairo_hash_table_t  *top_dict)
+{
+    unsigned char *p;
+    unsigned char *end;
+    int size;
+    double x_min, y_min, x_max, y_max;
+    double xx, yx, xy, yy;
+    x_min = 0.0;
+    y_min = 0.0;
+    x_max = 0.0;
+    y_max = 0.0;
+    p = cff_dict_get_operands (font->top_dict, FONTBBOX_OP, &size);
+    if (p) {
+        end = p + size;
+        if (p < end)
+            p = decode_number (p, &x_min);
+        if (p < end)
+            p = decode_number (p, &y_min);
+        if (p < end)
+            p = decode_number (p, &x_max);
+        if (p < end)
+            p = decode_number (p, &y_max);
+    }
+    font->x_min = floor (x_min);
+    font->y_min = floor (y_min);
+    font->x_max = floor (x_max);
+    font->y_max = floor (y_max);
+    font->ascent = font->y_max;
+    font->descent = font->y_min;
+    xx = 0.001;
+    yx = 0.0;
+    xy = 0.0;
+    yy = 0.001;
+    p = cff_dict_get_operands (font->top_dict, FONTMATRIX_OP, &size);
+    if (p) {
+        end = p + size;
+        if (p < end)
+            p = decode_number (p, &xx);
+        if (p < end)
+            p = decode_number (p, &yx);
+        if (p < end)
+            p = decode_number (p, &xy);
+        if (p < end)
+            p = decode_number (p, &yy);
+    }
+    /* Freetype uses 1/yy to get units per EM */
+    font->units_per_em = _cairo_round(1.0/yy);
+}
 static cairo_int_status_t
 cairo_cff_font_read_top_dict (cairo_cff_font_t *font)
+{
     if (unlikely (status))
         goto fail;
     font->num_glyphs = _cairo_array_num_elements (&font->charstrings_index);
+    if (font->is_cid) {
+	 operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size);
+	 if (!operand)
+	      return CAIRO_INT_STATUS_UNSUPPORTED;
+	 decode_integer (operand, &offset);
+	 font->charset = font->data + offset;
+	 if (font->charset >= font->data_end)
+	      return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+    if (!font->is_opentype)
+        cairo_cff_font_read_font_metrics (font, font->top_dict);
     if (font->is_cid) {
         operand = cff_dict_get_operands (font->top_dict, FDSELECT_OP, &size);
         decode_integer (operand, &offset);
         status = cairo_cff_font_read_fdselect (font, font->data + offset);
 	if (unlikely (status))
         operand = decode_integer (operand, &size);
         decode_integer (operand, &offset);
-        status = cairo_cff_font_read_private_dict (font,
+	status = cairo_cff_font_read_private_dict (font,
                                                    font->private_dict,
 						   &font->local_sub_index,
+						   &font->local_sub_bias,
+						   &font->local_subs_used,
+                                                   &font->default_width,
+                                                   &font->nominal_width,
 						   font->data + offset,
 						   size);
 	if (unlikely (status))
 	    goto fail;
+    }
 	                            CHARSTRINGS_OP, buf, end_buf - buf);
     if (unlikely (status))
 	goto fail;
     status = cff_dict_set_operands (font->top_dict,
-	                            FDSELECT_OP, buf, end_buf - buf);
+	                            CHARSET_OP, buf, end_buf - buf);
     if (unlikely (status))
+	goto fail;
 	goto fail;
+    if (font->scaled_font_subset->is_latin) {
+        status = cff_dict_set_operands (font->top_dict,
+                                        ENCODING_OP, buf, end_buf - buf);
+        if (unlikely (status))
+            goto fail;
+	/* Private has two operands - size and offset */
-    status = cff_dict_set_operands (font->top_dict,
+	end_buf = encode_integer_max (end_buf, 0);
-	                            FDARRAY_OP, buf, end_buf - buf);
+	cff_dict_set_operands (font->top_dict, PRIVATE_OP, buf, end_buf - buf);
+        if (unlikely (status))
-    if (unlikely (status))
+            goto fail;
-	goto fail;
+    } else {
+        status = cff_dict_set_operands (font->top_dict,
+                                        FDSELECT_OP, buf, end_buf - buf);
+        if (unlikely (status))
+            goto fail;
-    status = cff_dict_set_operands (font->top_dict,
+        status = cff_dict_set_operands (font->top_dict,
-	                            CHARSET_OP, buf, end_buf - buf);
+                                        FDARRAY_OP, buf, end_buf - buf);
-    if (unlikely (status))
+        if (unlikely (status))
+            goto fail;
 	goto fail;
         cff_dict_remove (font->top_dict, ENCODING_OP);
-    cff_dict_remove (font->top_dict, ENCODING_OP);
+        cff_dict_remove (font->top_dict, PRIVATE_OP);
     cff_dict_remove (font->top_dict, PRIVATE_OP);
+}
 static cairo_int_status_t
 cairo_cff_font_read_global_subroutines (cairo_cff_font_t *font)
+{
+    cairo_int_status_t status;
+    int num_subs;
-{
+    status = cff_index_read (&font->global_sub_index, &font->current_ptr, font->data_end);
+    if (unlikely (status))
+	return status;
+    num_subs = _cairo_array_num_elements (&font->global_sub_index);
+    font->global_subs_used = calloc (num_subs, sizeof(cairo_bool_t));
+    if (unlikely (font->global_subs_used == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    if (num_subs < 1240)
+        font->global_sub_bias = 107;
+    else if (num_subs < 33900)
+        font->global_sub_bias = 1131;
+    else
+        font->global_sub_bias = 32768;
-    return cff_index_read (&font->global_sub_index, &font->current_ptr, font->data_end);
+    return CAIRO_STATUS_SUCCESS;
+}
+    }
     return CAIRO_STATUS_SUCCESS;
+}
+static unsigned char *
+type2_decode_integer (unsigned char *p, int *integer)
+{
+    if (*p == 28) {
+	*integer = p[1] << 8 | p[2];
+	p += 3;
+    } else if (*p <= 246) {
+        *integer = *p++ - 139;
+    } else if (*p <= 250) {
+        *integer = (p[0] - 247) * 256 + p[1] + 108;
+        p += 2;
+    } else if (*p <= 254) {
+        *integer = -(p[0] - 251) * 256 - p[1] - 108;
+        p += 2;
+    } else { /* *p == 255 */
+	 /* 16.16 fixed-point number. The fraction is ignored. */
+	 *integer = (int16_t)((p[1] << 8) | p[2]);
+        p += 5;
+    }
+    return p;
+}
+/* Type 2 charstring parser for finding calls to local or global
+ * subroutines. For non Opentype CFF fonts it also gets the glyph
+ * widths.
+ *
+ * When we find a subroutine operator, the subroutine is marked as in
+ * use and recursively followed. The subroutine number is the value on
+ * the top of the stack when the subroutine operator is executed. In
+ * most fonts the subroutine number is encoded in an integer
+ * immediately preceding the subroutine operator. However it is
+ * possible for the subroutine number on the stack to be the result of
+ * a computation (in which case there will be an operator preceding
+ * the subroutine operator). If this occurs, subroutine subsetting is
+ * disabled since we can't easily determine which subroutines are
+ * used.
+ *
+ * The width, if present, is the first integer in the charstring. The
+ * only way to confirm if the integer at the start of the charstring is
+ * the width is when the first stack clearing operator is parsed,
+ * check if there is an extra integer left over on the stack.
+ *
+ * When the first stack clearing operator is encountered
+ * type2_find_width is set to FALSE and type2_found_width is set to
  * TRUE if an extra argument is found, otherwise FALSE.
+ */
+static cairo_status_t
+cairo_cff_parse_charstring (cairo_cff_font_t *font,
+                            unsigned char *charstring, int length,
+                            int glyph_id,
+			    cairo_bool_t need_width)
+{
+    unsigned char *p = charstring;
+    unsigned char *end = charstring + length;
+    int integer;
+    int hint_bytes;
+    int sub_num;
+    cff_index_element_t *element;
+    int fd;
+    while (p < end) {
+        if (*p == 28 || *p >= 32) {
+            /* Integer value */
+            p = type2_decode_integer (p, &integer);
+            font->type2_stack_size++;
+            font->type2_stack_top_value = integer;
+            font->type2_stack_top_is_int = TRUE;
+	    if (!font->type2_seen_first_int) {
+		font->type2_width = integer;
+		font->type2_seen_first_int = TRUE;
+	    }
+	} else if (*p == TYPE2_hstem || *p == TYPE2_vstem ||
+		   *p == TYPE2_hstemhm || *p == TYPE2_vstemhm) {
+            /* Hint operator. The number of hints declared by the
+             * operator depends on the size of the stack. */
+	    font->type2_stack_top_is_int = FALSE;
+	    font->type2_num_hints += font->type2_stack_size/2;
+	    if (font->type2_find_width && font->type2_stack_size % 2)
+		font->type2_found_width = TRUE;
+	    font->type2_stack_size = 0;
+	    font->type2_find_width = FALSE;
+	    p++;
+	} else if (*p == TYPE2_hintmask || *p == TYPE2_cntrmask) {
+	    /* Hintmask operator. These operators are followed by a
+	     * variable length mask where the length depends on the
+	     * number of hints declared. The first time this is called
+	     * it is also an implicit vstem if there are arguments on
+	     * the stack. */
+	    if (font->type2_hintmask_bytes == 0) {
+		font->type2_stack_top_is_int = FALSE;
+		font->type2_num_hints += font->type2_stack_size/2;
+		if (font->type2_find_width && font->type2_stack_size % 2)
+		    font->type2_found_width = TRUE;
+		font->type2_stack_size = 0;
+		font->type2_find_width = FALSE;
+		font->type2_hintmask_bytes = (font->type2_num_hints+7)/8;
+	    }
+	    hint_bytes = font->type2_hintmask_bytes;
+	    p++;
+	    p += hint_bytes;
+	} else if (*p == TYPE2_rmoveto) {
+	    if (font->type2_find_width && font->type2_stack_size > 2)
+		font->type2_found_width = TRUE;
+	    font->type2_stack_size = 0;
+	    font->type2_find_width = FALSE;
+	    font->type2_has_path = TRUE;
+	    p++;
+	} else if (*p == TYPE2_hmoveto || *p == TYPE2_vmoveto) {
+	    if (font->type2_find_width && font->type2_stack_size > 1)
+		font->type2_found_width = TRUE;
+	    font->type2_stack_size = 0;
+	    font->type2_find_width = FALSE;
+	    font->type2_has_path = TRUE;
+	    p++;
+	} else if (*p == TYPE2_endchar) {
+	    if (!font->type2_has_path && font->type2_stack_size > 3)
+		return CAIRO_INT_STATUS_UNSUPPORTED; /* seac (Ref Appendix C of Type 2 Charstring Format */
+	    if (font->type2_find_width && font->type2_stack_size > 0)
+		font->type2_found_width = TRUE;
+	    return CAIRO_STATUS_SUCCESS;
+        } else if (*p == TYPE2_callsubr) {
+            /* call to local subroutine */
+	    if (! font->type2_stack_top_is_int)
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+            if (++font->type2_nesting_level > MAX_SUBROUTINE_NESTING)
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+            p++;
+	    font->type2_stack_top_is_int = FALSE;
+            font->type2_stack_size--;
+	    if (font->type2_find_width && font->type2_stack_size == 0)
+		font->type2_seen_first_int = FALSE;
+            if (font->is_cid) {
+                fd = font->fdselect[glyph_id];
+                sub_num = font->type2_stack_top_value + font->fd_local_sub_bias[fd];
+                element = _cairo_array_index (&font->fd_local_sub_index[fd], sub_num);
+                if (! font->fd_local_subs_used[fd][sub_num]) {
+		    font->fd_local_subs_used[fd][sub_num] = TRUE;
+		    cairo_cff_parse_charstring (font, element->data, element->length, glyph_id, need_width);
+		}
+            } else {
+                sub_num = font->type2_stack_top_value + font->local_sub_bias;
+                element = _cairo_array_index (&font->local_sub_index, sub_num);
+                if (! font->local_subs_used[sub_num] ||
+		    (need_width && !font->type2_found_width))
+		{
+		    font->local_subs_used[sub_num] = TRUE;
+		    cairo_cff_parse_charstring (font, element->data, element->length, glyph_id, need_width);
+		}
+            }
+            font->type2_nesting_level--;
+        } else if (*p == TYPE2_callgsubr) {
+            /* call to global subroutine */
+	    if (! font->type2_stack_top_is_int)
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+            if (++font->type2_nesting_level > MAX_SUBROUTINE_NESTING)
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+            p++;
+            font->type2_stack_size--;
+	    font->type2_stack_top_is_int = FALSE;
+	    if (font->type2_find_width && font->type2_stack_size == 0)
+		font->type2_seen_first_int = FALSE;
+	    sub_num = font->type2_stack_top_value + font->global_sub_bias;
+	    element = _cairo_array_index (&font->global_sub_index, sub_num);
+            if (! font->global_subs_used[sub_num] ||
+		(need_width && !font->type2_found_width))
+	    {
+                font->global_subs_used[sub_num] = TRUE;
+                cairo_cff_parse_charstring (font, element->data, element->length, glyph_id, need_width);
+            }
+            font->type2_nesting_level--;
+        } else if (*p == 12) {
+            /* 2 byte instruction */
+	    /* All the 2 byte operators are either not valid before a
+	     * stack clearing operator or they are one of the
+	     * arithmetic, storage, or conditional operators. */
+	    if (need_width && font->type2_find_width)
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+            p += 2;
+	    font->type2_stack_top_is_int = FALSE;
+	} else {
+            /* 1 byte instruction */
+            p++;
+	    font->type2_stack_top_is_int = FALSE;
+        }
+    }
+    return CAIRO_STATUS_SUCCESS;
+}
+static cairo_status_t
+cairo_cff_find_width_and_subroutines_used (cairo_cff_font_t  *font,
+					   unsigned char *charstring, int length,
+					   int glyph_id, int subset_id)
+{
+    cairo_status_t status;
+    int width;
+    int fd;
+    font->type2_stack_size = 0;
+    font->type2_stack_top_value = 0;;
+    font->type2_stack_top_is_int = FALSE;
+    font->type2_num_hints = 0;
+    font->type2_hintmask_bytes = 0;
+    font->type2_nesting_level = 0;
+    font->type2_seen_first_int = FALSE;
+    font->type2_find_width = TRUE;
+    font->type2_found_width = FALSE;
+    font->type2_width = 0;
+    font->type2_has_path = FALSE;
+    status = cairo_cff_parse_charstring (font, charstring, length, glyph_id, TRUE);
+    if (status)
+	return status;
+    if (!font->is_opentype) {
+        if (font->is_cid) {
+            fd = font->fdselect[glyph_id];
+            if (font->type2_found_width)
+                width = font->fd_nominal_width[fd] + font->type2_width;
+            else
+                width = font->fd_default_width[fd];
+        } else {
+            if (font->type2_found_width)
+                width = font->nominal_width + font->type2_width;
+            else
+                width = font->default_width;
+        }
+        font->widths[subset_id] = width;
+    }
+    return CAIRO_STATUS_SUCCESS;
+}
+static cairo_int_status_t
+cairo_cff_font_get_gid_for_cid (cairo_cff_font_t  *font, unsigned long cid, unsigned long *gid)
+{
+    unsigned char *p;
+    unsigned long first_gid;
+    unsigned long first_cid;
+    int num_left;
+    unsigned long c, g;
+    if (cid == 0) {
+	*gid = 0;
+	return CAIRO_STATUS_SUCCESS;
+    }
+    switch (font->charset[0]) {
+	/* Format 0 */
+	case 0:
+	    p = font->charset + 1;
+	    g = 1;
+	    while (g <= (unsigned)font->num_glyphs && p < font->data_end) {
+		c = be16_to_cpu( *((uint16_t *)p) );
+		if (c == cid) {
+		    *gid = g;
+		    return CAIRO_STATUS_SUCCESS;
+		}
+		g++;
+		p += 2;
+	    }
+	    break;
+	/* Format 1 */
+	case 1:
+	    first_gid = 1;
+	    p = font->charset + 1;
+	    while (first_gid <= (unsigned)font->num_glyphs && p + 2 < font->data_end) {
+		first_cid = be16_to_cpu( *((uint16_t *)p) );
+		num_left = p[2];
+		if (cid >= first_cid && cid <= first_cid + num_left) {
+		    *gid = first_gid + cid - first_cid;
+		    return CAIRO_STATUS_SUCCESS;
+		}
+		first_gid += num_left + 1;
+		p += 3;
+	    }
+	    break;
+	/* Format 2 */
+	case 2:
+	    first_gid = 1;
+	    p = font->charset + 1;
+	    while (first_gid <= (unsigned)font->num_glyphs && p + 3 < font->data_end) {
+		first_cid = be16_to_cpu( *((uint16_t *)p) );
+		num_left = be16_to_cpu( *((uint16_t *)(p+2)) );
+		if (cid >= first_cid && cid <= first_cid + num_left) {
+		    *gid = first_gid + cid - first_cid;
+		    return CAIRO_STATUS_SUCCESS;
+		}
+		first_gid += num_left + 1;
+		p += 4;
+	    }
+	    break;
+	default:
+	    break;
+    }
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+}
-static cairo_status_t
+static cairo_int_status_t
-cairo_cff_font_subset_charstrings (cairo_cff_font_t  *font)
+cairo_cff_font_subset_charstrings_and_subroutines (cairo_cff_font_t  *font)
+{
     cff_index_element_t *element;
+    unsigned int i;
+    cairo_int_status_t status;
-    unsigned int i;
+    unsigned long glyph, cid;
+    font->subset_subroutines = TRUE;
-    cairo_status_t status;
+    for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
+	if (font->is_cid) {
+	    cid = font->scaled_font_subset->glyphs[i];
+	    status = cairo_cff_font_get_gid_for_cid (font, cid, &glyph);
+	    if (unlikely (status))
+		return status;
+	} else {
-    for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
+	    glyph = font->scaled_font_subset->glyphs[i];
         element = _cairo_array_index (&font->charstrings_index,
-                                      font->scaled_font_subset->glyphs[i]);
+        element = _cairo_array_index (&font->charstrings_index, glyph);
         status = cff_index_append (&font->charstrings_subset_index,
                                    element->data,
+                                   element->length);
+        if (unlikely (status))
+            return status;
+	if (font->subset_subroutines) {
+	    status = cairo_cff_find_width_and_subroutines_used (font,
+								element->data, element->length,
+								glyph, i);
+	    if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
+		/* If parsing the charstrings fails we embed all the
+		 * subroutines. But if the font is not opentype we
+		 * need to successfully parse all charstrings to get
+		 * the widths. */
+		font->subset_subroutines = FALSE;
+		if (!font->is_opentype)
+		    return status;
+	    } else if (unlikely (status)) {
-                                   element->length);
+                return status;
         if (unlikely (status))
             return status;
 cairo_cff_font_subset_fontdict (cairo_cff_font_t  *font)
+{
     unsigned int i;
     int fd;
     int *reverse_map;
+    unsigned long cid, gid;
+    cairo_int_status_t status;
     font->fdselect_subset = calloc (font->scaled_font_subset->num_glyphs,
                                      sizeof (int));
     if (unlikely (font->fdselect_subset == NULL))
     for (i = 0; i < font->num_fontdicts; i++)
         reverse_map[i] = -1;
     font->num_subset_fontdicts = 0;
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
+	cid = font->scaled_font_subset->glyphs[i];
+	status = cairo_cff_font_get_gid_for_cid (font, cid, &gid);
+	if (unlikely (status))
+	    return status;
-        fd = font->fdselect[font->scaled_font_subset->glyphs[i]];
+        fd = font->fdselect[gid];
         if (reverse_map[fd] < 0) {
             font->fd_subset_map[font->num_subset_fontdicts] = fd;
             reverse_map[fd] = font->num_subset_fontdicts++;
+        }
+    }
     return status;
+}
+/* The Euro is the only the only character in the winansi encoding
+ * with a glyph name that is not a CFF standard string. As the strings
+ * are written before the charset, we need to check during the
+ * subsetting phase if the Euro glyph is required and add the
+ * glyphname to the list of strings to write out.
+ */
+static cairo_status_t
+cairo_cff_font_add_euro_charset_string (cairo_cff_font_t *font)
+{
+    cairo_status_t status;
+    unsigned int i;
+    int ch;
+    const char *euro = "Euro";
+    for (i = 1; i < font->scaled_font_subset->num_glyphs; i++) {
+	ch = font->scaled_font_subset->to_latin_char[i];
+	if (ch == 128) {
+	    font->euro_sid = NUM_STD_STRINGS + _cairo_array_num_elements (&font->strings_subset_index);
+	    status = cff_index_append_copy (&font->strings_subset_index,
+					    (unsigned char *)euro, strlen(euro));
+	    return status;
+	}
+    }
+    return CAIRO_STATUS_SUCCESS;
+}
 static cairo_status_t
 cairo_cff_font_subset_font (cairo_cff_font_t  *font)
+{
     cairo_status_t status;
     cairo_status_t status;
     if (!font->scaled_font_subset->is_latin) {
+	status = cairo_cff_font_set_ros_strings (font);
-    status = cairo_cff_font_set_ros_strings (font);
+	if (unlikely (status))
-    if (unlikely (status))
+	    return status;
 	return status;
     status = cairo_cff_font_subset_charstrings_and_subroutines (font);
-    status = cairo_cff_font_subset_charstrings (font);
+    if (unlikely (status))
-    if (unlikely (status))
+        return status;
         return status;
     if (!font->scaled_font_subset->is_latin) {
-    if (font->is_cid)
+	if (font->is_cid)
+	    status = cairo_cff_font_subset_fontdict (font);
+	else
+	    status = cairo_cff_font_create_cid_fontdict (font);
+	if (unlikely (status))
+	    return status;
-        status = cairo_cff_font_subset_fontdict (font);
+    }  else {
-    else
+	font->private_dict_offset = malloc (sizeof (int));
-        status = cairo_cff_font_create_cid_fontdict (font);
+	if (unlikely (font->private_dict_offset == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    }
-    if (unlikely (status))
+    status = cairo_cff_font_subset_strings (font);
-	return status;
+    if (unlikely (status))
         return status;
     status = cairo_cff_font_subset_strings (font);
     cairo_array_t index;
     cff_index_init (&index);
     status = cff_index_append_copy (&index,
-                                    (unsigned char *) font->subset_font_name,
+                                    (unsigned char *) font->ps_name,
-                                    strlen(font->subset_font_name));
+                                    strlen(font->ps_name));
     if (unlikely (status))
 	goto FAIL;
+}
 static cairo_status_t
 cairo_cff_font_write_global_subrs (cairo_cff_font_t  *font)
+{
+    unsigned int i;
+    unsigned char return_op = TYPE2_return;
+    /* poppler and fontforge don't like zero length subroutines so we
+     * replace unused subroutines with a 'return' instruction. */
+    if (font->subset_subroutines) {
+        for (i = 0; i < _cairo_array_num_elements (&font->global_sub_index); i++) {
+            if (! font->global_subs_used[i])
+                cff_index_set_object (&font->global_sub_index, i, &return_op, 1);
+        }
+    }
     return cff_index_write (&font->global_sub_index, &font->output);
+}
+static cairo_status_t
+cairo_cff_font_write_encoding (cairo_cff_font_t  *font)
+{
+    unsigned char buf[2];
+    cairo_status_t status;
+    unsigned int i;
+    cairo_cff_font_set_topdict_operator_to_cur_pos (font, ENCODING_OP);
+    buf[0] = 0; /* Format 0 */
+    buf[1] = font->scaled_font_subset->num_glyphs - 1;
+    status = _cairo_array_append_multiple (&font->output, buf, 2);
+    if (unlikely (status))
+	return status;
+    for (i = 1; i < font->scaled_font_subset->num_glyphs; i++) {
+	unsigned char ch = font->scaled_font_subset->to_latin_char[i];
+        status = _cairo_array_append (&font->output, &ch);
+        if (unlikely (status))
+            return status;
+    }
+    return CAIRO_STATUS_SUCCESS;
+}
 static cairo_status_t
 cairo_cff_font_write_fdselect (cairo_cff_font_t  *font)
+{
     unsigned char data;
         if (unlikely (status))
             return status;
         byte = 3;
         status = _cairo_array_append (&font->output, &byte);
-        assert (status == CAIRO_STATUS_SUCCESS);
+        assert (status == CAIRO_INT_STATUS_SUCCESS);
         word = cpu_to_be16 (1);
         status = _cairo_array_append_multiple (&font->output, &word, 2);
-        assert (status == CAIRO_STATUS_SUCCESS);
+        assert (status == CAIRO_INT_STATUS_SUCCESS);
         word = cpu_to_be16 (0);
         status = _cairo_array_append_multiple (&font->output, &word, 2);
-        assert (status == CAIRO_STATUS_SUCCESS);
+        assert (status == CAIRO_INT_STATUS_SUCCESS);
         byte = 0;
         status = _cairo_array_append (&font->output, &byte);
-        assert (status == CAIRO_STATUS_SUCCESS);
+        assert (status == CAIRO_INT_STATUS_SUCCESS);
         word = cpu_to_be16 (font->scaled_font_subset->num_glyphs);
+        status = _cairo_array_append_multiple (&font->output, &word, 2);
+        assert (status == CAIRO_INT_STATUS_SUCCESS);
+    }
+    return CAIRO_STATUS_SUCCESS;
+}
+/* Winansi to CFF standard strings mapping for characters 128 to 255 */
+static const int winansi_to_cff_std_string[] = {
+	/* 128 */
+,   0, 117, 101, 118, 121, 112, 113,
+, 122, 192, 107, 142,   0, 199,   0,
+	/* 144 */
+,  65,   8, 105, 119, 116, 111, 137,
+, 153, 221, 108, 148,   0, 228, 198,
+	/* 160 */
+,  96,  97,  98, 103, 100, 160, 102,
+, 170, 139, 106, 151,   0, 165, 128,
+	/* 176 */
+, 156, 164, 169, 125, 152, 115, 114,
+, 150, 143, 120, 158, 155, 163, 123,
+	/* 192 */
+, 171, 172, 176, 173, 175, 138, 177,
+, 178, 179, 180, 185, 182, 183, 184,
+	/* 208 */
+, 186, 190, 187, 188, 191, 189, 168,
+, 196, 193, 194, 195, 197, 157, 149,
+	/* 224 */
+, 200, 201, 205, 202, 204, 144, 206,
+, 207, 208, 209, 214, 211, 212, 213,
+	/* 240 */
+, 215, 219, 216, 217, 220, 218, 159,
+, 225, 222, 223, 224, 226, 162, 227,
+};
+static int
+cairo_cff_font_get_sid_for_winansi_char (cairo_cff_font_t  *font, int ch)
+{
+    int sid;
+    if (ch == 39) {
+	sid = 104;
+    } else if (ch == 96) {
+	sid = 124;
+    } else if (ch >= 32 && ch <= 126) {
+	sid = ch - 31;
+    } else if (ch == 128) {
+	assert (font->euro_sid >= NUM_STD_STRINGS);
+	sid = font->euro_sid;
+    } else if (ch >= 128 && ch <= 255) {
+	sid = winansi_to_cff_std_string[ch - 128];
-        status = _cairo_array_append_multiple (&font->output, &word, 2);
+    } else {
+	sid = 0;
+    }
+    return sid;
+}
+static cairo_status_t
+cairo_cff_font_write_type1_charset (cairo_cff_font_t  *font)
+{
+    unsigned char format = 0;
+    unsigned int i;
+    int ch, sid;
+    cairo_status_t status;
+    uint16_t sid_be16;
+    cairo_cff_font_set_topdict_operator_to_cur_pos (font, CHARSET_OP);
+    status = _cairo_array_append (&font->output, &format);
+    if (unlikely (status))
+	return status;
+    for (i = 1; i < font->scaled_font_subset->num_glyphs; i++) {
+	ch = font->scaled_font_subset->to_latin_char[i];
+	sid = cairo_cff_font_get_sid_for_winansi_char (font, ch);
+        if (unlikely (status))
+	    return status;
+	sid_be16 = cpu_to_be16(sid);
+	status = _cairo_array_append_multiple (&font->output, &sid_be16, sizeof(sid_be16));
+        if (unlikely (status))
-        assert (status == CAIRO_STATUS_SUCCESS);
+            return status;
+    }
     return CAIRO_STATUS_SUCCESS;
+}
 static cairo_status_t
 cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *font)
+{
     unsigned int i;
     cairo_int_status_t status;
+    unsigned int offset_array;
-    uint32_t *offset_array;
+    uint32_t *offset_array_ptr;
     int offset_base;
     uint16_t count;
     uint8_t offset_size = 4;
     if (unlikely (status))
         return status;
     status = _cairo_array_append (&font->output, &offset_size);
     if (unlikely (status))
         return status;
+    offset_array = _cairo_array_num_elements (&font->output);
     status = _cairo_array_allocate (&font->output,
                                     (font->num_subset_fontdicts + 1)*offset_size,
-                                    (void **) &offset_array);
+                                    (void **) &offset_array_ptr);
     if (unlikely (status))
         return status;
     offset_base = _cairo_array_num_elements (&font->output) - 1;
-    *offset_array++ = cpu_to_be32(1);
+    *offset_array_ptr = cpu_to_be32(1);
+    offset_array += sizeof(uint32_t);
     for (i = 0; i < font->num_subset_fontdicts; i++) {
         status = cff_dict_write (font->fd_dict[font->fd_subset_map[i]],
                                  &font->output);
         if (unlikely (status))
             return status;
+	offset_array_ptr = (uint32_t *) _cairo_array_index (&font->output, offset_array);
-        *offset_array++ = cpu_to_be32(_cairo_array_num_elements (&font->output) - offset_base);
+        *offset_array_ptr = cpu_to_be32(_cairo_array_num_elements (&font->output) - offset_base);
+	offset_array += sizeof(uint32_t);
+    }
     return CAIRO_STATUS_SUCCESS;
 static cairo_status_t
 cairo_cff_font_write_local_sub (cairo_cff_font_t   *font,
                                 int                 dict_num,
                                 cairo_hash_table_t *private_dict,
+                                cairo_array_t      *local_sub_index,
-                                cairo_array_t      *local_sub_index)
+                                cairo_bool_t       *local_subs_used)
+{
     int offset;
     int size;
     unsigned char buf[10];
     unsigned char *buf_end;
     unsigned char *p;
+    cairo_status_t status;
+    unsigned int i;
-    cairo_status_t status;
+    unsigned char return_op = TYPE2_return;
     if (_cairo_array_num_elements (local_sub_index) > 0) {
         /* Write local subroutines and update offset in private
         buf_end = encode_integer_max (buf, offset);
         offset = cff_dict_get_location (private_dict, LOCAL_SUB_OP, &size);
         assert (offset > 0);
         p = _cairo_array_index (&font->output, offset);
         memcpy (p, buf, buf_end - buf);
+	/* poppler and fontforge don't like zero length subroutines so
+	 * we replace unused subroutines with a 'return' instruction.
+	 */
+        if (font->subset_subroutines) {
+            for (i = 0; i < _cairo_array_num_elements (local_sub_index); i++) {
+                if (! local_subs_used[i])
+                    cff_index_set_object (local_sub_index, i, &return_op, 1);
+            }
+        }
         status = cff_index_write (local_sub_index, &font->output);
         if (unlikely (status))
             return status;
+    }
         for (i = 0; i < font->num_subset_fontdicts; i++) {
             status = cairo_cff_font_write_local_sub (
                             font,
                             i,
                             font->fd_private_dict[font->fd_subset_map[i]],
-                           &font->fd_local_sub_index[font->fd_subset_map[i]]);
+                            &font->fd_local_sub_index[font->fd_subset_map[i]],
+                            font->fd_local_subs_used[font->fd_subset_map[i]]);
             if (unlikely (status))
                 return status;
+        }
     } else {
         status = cairo_cff_font_write_private_dict (font,
 	    return status;
         status = cairo_cff_font_write_local_sub (font,
 ,
                                                  font->private_dict,
+                                                 &font->local_sub_index,
-                                                 &font->local_sub_index);
+                                                 font->local_subs_used);
 	if (unlikely (status))
 	    return status;
+    }
+    return CAIRO_STATUS_SUCCESS;
+}
+static cairo_status_t
+cairo_cff_font_write_type1_private_dict_and_local_sub (cairo_cff_font_t  *font)
+{
+    cairo_int_status_t status;
+    status = cairo_cff_font_write_private_dict (font,
+,
+						font->top_dict,
+						font->private_dict);
+    if (unlikely (status))
+	return status;
+    status = cairo_cff_font_write_local_sub (font,
+,
+					     font->private_dict,
+					     &font->local_sub_index,
+					     font->local_subs_used);
+    if (unlikely (status))
+	return status;
+    return CAIRO_STATUS_SUCCESS;
     return CAIRO_STATUS_SUCCESS;
 typedef cairo_status_t
 (*font_write_t) (cairo_cff_font_t *font);
-static const font_write_t font_write_funcs[] = {
+static const font_write_t font_write_cid_funcs[] = {
     cairo_cff_font_write_header,
     cairo_cff_font_write_name,
     cairo_cff_font_write_top_dict,
     cairo_cff_font_write_strings,
     cairo_cff_font_write_global_subrs,
-    cairo_cff_font_write_charset,
+    cairo_cff_font_write_cid_charset,
     cairo_cff_font_write_fdselect,
+    cairo_cff_font_write_charstrings,
+    cairo_cff_font_write_cid_fontdict,
+    cairo_cff_font_write_cid_private_dict_and_local_sub,
+};
+static const font_write_t font_write_type1_funcs[] = {
+    cairo_cff_font_write_header,
+    cairo_cff_font_write_name,
+    cairo_cff_font_write_top_dict,
+    cairo_cff_font_write_strings,
+    cairo_cff_font_write_global_subrs,
+    cairo_cff_font_write_encoding,
-    cairo_cff_font_write_charstrings,
+    cairo_cff_font_write_type1_charset,
-    cairo_cff_font_write_cid_fontdict,
+    cairo_cff_font_write_charstrings,
-    cairo_cff_font_write_cid_private_dict_and_local_sub,
+    cairo_cff_font_write_type1_private_dict_and_local_sub,
 };
+static cairo_status_t
+cairo_cff_font_write_subset (cairo_cff_font_t *font)
+{
+    cairo_int_status_t status;
+    unsigned int i;
+    if (font->scaled_font_subset->is_latin) {
-static cairo_status_t
+        for (i = 0; i < ARRAY_LENGTH (font_write_type1_funcs); i++) {
-cairo_cff_font_write_subset (cairo_cff_font_t *font)
+            status = font_write_type1_funcs[i] (font);
             if (unlikely (status))
-    cairo_int_status_t status;
+                return status;
     unsigned int i;
+    } else {
         for (i = 0; i < ARRAY_LENGTH (font_write_cid_funcs); i++) {
-    for (i = 0; i < ARRAY_LENGTH (font_write_funcs); i++) {
+            status = font_write_cid_funcs[i] (font);
-        status = font_write_funcs[i] (font);
+            if (unlikely (status))
     status = cairo_cff_font_read_font (font);
     if (unlikely (status))
+        return status;
+    /* If the PS name is not found, create a CairoFont-x-y name. */
+    if (font->ps_name == NULL) {
+        font->ps_name = malloc (30);
+        if (unlikely (font->ps_name == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        snprintf(font->ps_name, 30, "CairoFont-%u-%u",
+                 font->scaled_font_subset->font_id,
+                 font->scaled_font_subset->subset_id);
         return status;
     status = cairo_cff_font_subset_font (font);
     if (unlikely (status))
         return status;
+    status = cairo_cff_font_write_subset (font);
-    status = cairo_cff_font_write_subset (font);
+    if (unlikely (status))
-    if (unlikely (status))
+        return status;
         return status;
                                                  (unsigned char*) &hhea, &size);
     if (unlikely (status))
         return status;
     num_hmetrics = be16_to_cpu (hhea.num_hmetrics);
-    for (i = 1; i < font->scaled_font_subset->num_glyphs; i++) {
+    for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
         glyph_index = font->scaled_font_subset->glyphs[i];
         long_entry_size = 2 * sizeof (int16_t);
         short_entry_size = sizeof (int16_t);
         if (glyph_index < num_hmetrics) {
+    }
     return CAIRO_STATUS_SUCCESS;
+}
+static cairo_bool_t
+check_fontdata_is_cff (const unsigned char *data, long length)
+{
+    cff_header_t *header;
+    if (length < (long)sizeof (cff_header_t))
+        return FALSE;
+    header = (cff_header_t *) data;
+    if (header->major == 1 &&
+	header->minor == 0 &&
+	header->header_size == 4)
+    {
+	return TRUE;
+    }
+    return FALSE;
+}
-static cairo_int_status_t
-_cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
-                        cairo_cff_font_t           **font_return,
+static cairo_int_status_t
-                        const char                  *subset_name)
+_cairo_cff_font_load_opentype_cff (cairo_cff_font_t  *font)
+{
-    const cairo_scaled_font_backend_t *backend;
-    cairo_status_t status;
+    const cairo_scaled_font_backend_t *backend = font->backend;
-    cairo_cff_font_t *font;
+    cairo_status_t status;
     tt_head_t head;
-    tt_hhea_t hhea;
-    unsigned long size, data_length;
+    tt_hhea_t hhea;
     unsigned long size, data_length;
     backend = scaled_font_subset->scaled_font->backend;
     if (!backend->load_truetype_table)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     data_length = 0;
-    status = backend->load_truetype_table( scaled_font_subset->scaled_font,
+    status = backend->load_truetype_table (font->scaled_font_subset->scaled_font,
                                            TT_TAG_CFF, 0, NULL, &data_length);
-    if (unlikely (status))
+    if (status)
         return status;
     size = sizeof (tt_head_t);
-    status = backend->load_truetype_table (scaled_font_subset->scaled_font,
+    status = backend->load_truetype_table (font->scaled_font_subset->scaled_font,
                                            TT_TAG_head, 0,
                                            (unsigned char *) &head, &size);
     if (unlikely (status))
         return status;
     size = sizeof (tt_hhea_t);
-    status = backend->load_truetype_table (scaled_font_subset->scaled_font,
+    status = backend->load_truetype_table (font->scaled_font_subset->scaled_font,
                                            TT_TAG_hhea, 0,
                                            (unsigned char *) &hhea, &size);
     if (unlikely (status))
-        return status;
-    size = 0;
-    status = backend->load_truetype_table (scaled_font_subset->scaled_font,
-                                           TT_TAG_hmtx, 0, NULL, &size);
-    if (unlikely (status))
-        return status;
-    font = malloc (sizeof (cairo_cff_font_t));
-    if (unlikely (font == NULL))
-        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-    font->backend = backend;
-    font->scaled_font_subset = scaled_font_subset;
-    _cairo_array_init (&font->output, sizeof (char));
-    status = _cairo_array_grow_by (&font->output, 4096);
-    if (unlikely (status))
+        return status;
 	goto fail2;
     size = 0;
-    font->subset_font_name = strdup (subset_name);
+    status = backend->load_truetype_table (font->scaled_font_subset->scaled_font,
-    if (unlikely (font->subset_font_name == NULL)) {
+                                           TT_TAG_hmtx, 0, NULL, &size);
     font->units_per_em = (int16_t) be16_to_cpu (head.units_per_em);
     if (font->units_per_em == 0)
         font->units_per_em = 1000;
     font->font_name = NULL;
-    status = _cairo_truetype_read_font_name (scaled_font_subset->scaled_font,
+    status = _cairo_truetype_read_font_name (font->scaled_font_subset->scaled_font,
 					     &font->ps_name,
 					     &font->font_name);
     if (_cairo_status_is_error (status))
-	goto fail3;
+	return status;
-    /* If the PS name is not found, create a CairoFont-x-y name. */
+    font->is_opentype = TRUE;
-    if (font->ps_name == NULL) {
+    font->data_length = data_length;
-        font->ps_name = malloc (30);
+    font->data = malloc (data_length);
+    if (unlikely (font->data == NULL))
+        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    status = font->backend->load_truetype_table (font->scaled_font_subset->scaled_font,
+						 TT_TAG_CFF, 0, font->data,
-        if (unlikely (font->ps_name == NULL)) {
+						 &font->data_length);
+    if (unlikely (status))
+        return status;
+    if (!check_fontdata_is_cff (font->data, data_length))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
 	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    return CAIRO_STATUS_SUCCESS;
+}
-            goto fail3;
+static cairo_int_status_t
+_cairo_cff_font_load_cff (cairo_cff_font_t  *font)
+{
+    const cairo_scaled_font_backend_t *backend = font->backend;
+    cairo_status_t status;
+    unsigned long data_length;
+    if (!backend->load_type1_data)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    data_length = 0;
+    status = backend->load_type1_data (font->scaled_font_subset->scaled_font,
+, NULL, &data_length);
+    if (unlikely (status))
+        return status;
+    font->font_name = NULL;
+    font->is_opentype = FALSE;
+    font->data_length = data_length;
+    font->data = malloc (data_length);
+    if (unlikely (font->data == NULL))
+        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    status = font->backend->load_type1_data (font->scaled_font_subset->scaled_font,
+, font->data, &font->data_length);
+    if (unlikely (status))
+        return status;
+    if (!check_fontdata_is_cff (font->data, data_length))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    return CAIRO_STATUS_SUCCESS;
+}
+static cairo_int_status_t
+_cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
-	}
+                        cairo_cff_font_t           **font_return,
+                        const char                  *subset_name)
+{
+    const cairo_scaled_font_backend_t *backend;
+    cairo_int_status_t status;
+    cairo_cff_font_t *font;
+    backend = scaled_font_subset->scaled_font->backend;
+    /* We need to use a fallback font generated from the synthesized outlines. */
+    if (backend->is_synthetic && backend->is_synthetic (scaled_font_subset->scaled_font))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    font = calloc (1, sizeof (cairo_cff_font_t));
+    if (unlikely (font == NULL))
+        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    font->backend = backend;
+    font->scaled_font_subset = scaled_font_subset;
+    status = _cairo_cff_font_load_opentype_cff (font);
+    if (status == CAIRO_INT_STATUS_UNSUPPORTED)
+	status = _cairo_cff_font_load_cff (font);
+    if (status)
+	goto fail1;
+    font->data_end = font->data + font->data_length;
+    _cairo_array_init (&font->output, sizeof (char));
+    status = _cairo_array_grow_by (&font->output, 4096);
+    if (unlikely (status))
+	goto fail2;
+    font->subset_font_name = strdup (subset_name);
-        snprintf(font->ps_name, 30, "CairoFont-%u-%u",
+    if (unlikely (font->subset_font_name == NULL)) {
-                 scaled_font_subset->font_id,
+        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-                 scaled_font_subset->subset_id);
+	goto fail2;
+    }
     font->widths = calloc (font->scaled_font_subset->num_glyphs, sizeof (int));
+    if (unlikely (font->widths == NULL)) {
-    if (unlikely (font->widths == NULL)) {
+        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        goto fail3;
-        goto fail4;
-    }
-    status = cairo_cff_font_create_set_widths (font);
-    if (unlikely (status))
-	goto fail5;
+    }
     font->data_length = data_length;
-    font->data = malloc (data_length);
-    if (unlikely (font->data == NULL)) {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        goto fail5;
-    }
-    status = font->backend->load_truetype_table ( font->scaled_font_subset->scaled_font,
-                                                  TT_TAG_CFF, 0, font->data,
-                                                  &font->data_length);
+    if (font->is_opentype) {
-    if (unlikely (status))
+	status = cairo_cff_font_create_set_widths (font);
-        goto fail6;
+	if (unlikely (status))
 	    goto fail4;
     font->data_end = font->data + font->data_length;
     status = cff_dict_init (&font->top_dict);
     if (unlikely (status))
-	goto fail6;
+	goto fail4;
     status = cff_dict_init (&font->private_dict);
     if (unlikely (status))
+	goto fail5;
 	goto fail7;
     cff_index_init (&font->strings_index);
-    cff_index_init (&font->strings_index);
+    cff_index_init (&font->charstrings_index);
-    cff_index_init (&font->charstrings_index);
+    cff_index_init (&font->global_sub_index);
+    cff_index_init (&font->local_sub_index);
-    cff_index_init (&font->global_sub_index);
+    cff_index_init (&font->charstrings_subset_index);
-    cff_index_init (&font->local_sub_index);
+    cff_index_init (&font->strings_subset_index);
-    cff_index_init (&font->charstrings_subset_index);
+    font->euro_sid = 0;
+    font->fdselect = NULL;
+    font->fd_dict = NULL;
+    font->fd_private_dict = NULL;
-    cff_index_init (&font->strings_subset_index);
+    font->fd_local_sub_index = NULL;
-    font->fdselect = NULL;
+    font->fd_local_sub_bias = NULL;
-    font->fd_dict = NULL;
-    font->fd_private_dict = NULL;
-    font->fd_local_sub_index = NULL;
-    font->fdselect_subset = NULL;
-    font->fd_subset_map = NULL;
+    font->fdselect_subset = NULL;
-    font->private_dict_offset = NULL;
+    font->fd_subset_map = NULL;
     font->private_dict_offset = NULL;
-    *font_return = font;
+    font->global_subs_used = NULL;
-    return CAIRO_STATUS_SUCCESS;
+    font->local_subs_used = NULL;
     font->fd_local_subs_used = NULL;
 fail7:
+    *font_return = font;
     _cairo_hash_table_destroy (font->top_dict);
+    return CAIRO_STATUS_SUCCESS;
+fail5:
-fail6:
+    _cairo_hash_table_destroy (font->top_dict);
-    free (font->data);
+fail4:
-fail5:
+    free (font->widths);
 cairo_cff_font_destroy (cairo_cff_font_t *font)
+{
     unsigned int i;
-    free (font->widths);
-    if (font->font_name)
+    free (font->widths);
-	free (font->font_name);
+    free (font->font_name);
     free (font->ps_name);
     free (font->subset_font_name);
     _cairo_array_fini (&font->output);
             if (font->fd_dict[i])
                 cff_dict_fini (font->fd_dict[i]);
+        }
         free (font->fd_dict);
+    }
+    free (font->global_subs_used);
-    if (font->fd_subset_map)
+    free (font->local_subs_used);
-        free (font->fd_subset_map);
+    free (font->fd_subset_map);
-    if (font->private_dict_offset)
-        free (font->private_dict_offset);
+    free (font->private_dict_offset);
-    if (font->is_cid) {
-        if (font->fdselect)
+    if (font->is_cid) {
-            free (font->fdselect);
-        if (font->fdselect_subset)
+	free (font->fdselect);
-            free (font->fdselect_subset);
+	free (font->fdselect_subset);
         if (font->fd_private_dict) {
             for (i = 0; i < font->num_fontdicts; i++) {
                 if (font->fd_private_dict[i])
         if (font->fd_local_sub_index) {
             for (i = 0; i < font->num_fontdicts; i++)
                 cff_index_fini (&font->fd_local_sub_index[i]);
             free (font->fd_local_sub_index);
+        }
+	free (font->fd_local_sub_bias);
+        if (font->fd_local_subs_used) {
+            for (i = 0; i < font->num_fontdicts; i++) {
+		free (font->fd_local_subs_used[i]);
+            }
+            free (font->fd_local_subs_used);
+        }
+	free (font->fd_default_width);
+	free (font->fd_nominal_width);
+    }
     if (font->data)
-        free (font->data);
+    free (font->data);
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto fail1;
+    }
     if (font->font_name) {
-	cff_subset->font_name = strdup (font->font_name);
+	cff_subset->family_name_utf8 = strdup (font->font_name);
-	if (cff_subset->font_name == NULL) {
+	if (cff_subset->family_name_utf8 == NULL) {
 	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	    goto fail2;
+	}
     } else {
-	cff_subset->font_name = NULL;
+	cff_subset->family_name_utf8 = NULL;
+    }
     cff_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
     return CAIRO_STATUS_SUCCESS;
  fail4:
     free (cff_subset->widths);
- fail3:
-    if (cff_subset->font_name)
+ fail3:
-	free (cff_subset->font_name);
+    free (cff_subset->family_name_utf8);
  fail2:
     free (cff_subset->ps_name);
  fail1:
 void
 _cairo_cff_subset_fini (cairo_cff_subset_t *subset)
+{
-    free (subset->ps_name);
-    if (subset->font_name)
+    free (subset->ps_name);
-	free (subset->font_name);
+    free (subset->family_name_utf8);
     free (subset->widths);
     free (subset->data);
+}
+cairo_bool_t
+_cairo_cff_scaled_font_is_cid_cff (cairo_scaled_font_t *scaled_font)
+{
+    const cairo_scaled_font_backend_t *backend;
+    cairo_int_status_t status;
+    unsigned char *data;
+    unsigned long data_length;
+    unsigned char *current_ptr;
+    unsigned char *data_end;
+    cff_header_t  *header;
+    cff_index_element_t *element;
+    cairo_hash_table_t  *top_dict;
+    cairo_array_t index;
+    int size;
+    cairo_bool_t is_cid = FALSE;
+    backend = scaled_font->backend;
+    data = NULL;
+    data_length = 0;
+    status = CAIRO_INT_STATUS_UNSUPPORTED;
+    /* Try to load an OpenType/CFF font */
+    if (backend->load_truetype_table &&
+	(status = backend->load_truetype_table (scaled_font, TT_TAG_CFF,
+, NULL, &data_length)) == CAIRO_INT_STATUS_SUCCESS)
+    {
+	data = malloc (data_length);
+	if (unlikely (data == NULL)) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    return FALSE;
+	}
+	status = backend->load_truetype_table (scaled_font, TT_TAG_CFF,
+, data, &data_length);
+	if (unlikely (status))
+	    goto fail1;
+    }
+    /* Try to load a CFF font */
+    if (status == CAIRO_INT_STATUS_UNSUPPORTED &&
+	backend->load_type1_data &&
+	(status = backend->load_type1_data (scaled_font,
+, NULL, &data_length)) == CAIRO_INT_STATUS_SUCCESS)
+    {
+	data = malloc (data_length);
+	if (unlikely (data == NULL)) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    return FALSE;
+	}
+	status = backend->load_type1_data (scaled_font, 0, data, &data_length);
+	if (unlikely (status))
+	    goto fail1;
+    }
+    if (status)
+	goto fail1;
+    /* Check if it looks like a CFF font */
+    if (!check_fontdata_is_cff (data, data_length))
+	goto fail1;
+    data_end = data + data_length;
+    /* skip header */
+    if (data_length < sizeof (cff_header_t))
+        goto fail1;
+    header = (cff_header_t *) data;
+    current_ptr = data + header->header_size;
+    /* skip name */
+    cff_index_init (&index);
+    status = cff_index_read (&index, ¤t_ptr, data_end);
+    cff_index_fini (&index);
+    if (status)
+        goto fail1;
+    /* read top dict */
+    cff_index_init (&index);
+    status = cff_index_read (&index, ¤t_ptr, data_end);
+    if (unlikely (status))
+        goto fail2;
+    status = cff_dict_init (&top_dict);
+    if (unlikely (status))
+	goto fail2;
+    element = _cairo_array_index (&index, 0);
+    status = cff_dict_read (top_dict, element->data, element->length);
+    if (unlikely (status))
+        goto fail3;
+    /* check for ROS operator indicating a CID font */
+    if (cff_dict_get_operands (top_dict, ROS_OP, &size) != NULL)
+        is_cid = TRUE;
+fail3:
+    cff_dict_fini (top_dict);
+fail2:
+    cff_index_fini (&index);
+fail1:
+    free (data);
+    return is_cid;
+}
 static cairo_int_status_t
 _cairo_cff_font_fallback_create (cairo_scaled_font_subset_t  *scaled_font_subset,
                                  cairo_cff_font_t           **font_return,
     cff_index_init (&font->charstrings_index);
     cff_index_init (&font->global_sub_index);
     cff_index_init (&font->local_sub_index);
     cff_index_init (&font->charstrings_subset_index);
     cff_index_init (&font->strings_subset_index);
+    font->global_subs_used = NULL;
+    font->local_subs_used = NULL;
+    font->subset_subroutines = FALSE;
     font->fdselect = NULL;
     font->fd_dict = NULL;
     font->fd_private_dict = NULL;
     font->fd_local_sub_index = NULL;
     font->fdselect_subset = NULL;
 fail5:
     _cairo_hash_table_destroy (font->top_dict);
 fail4:
     free (font->widths);
 fail3:
-    if (font->font_name)
-	free (font->font_name);
+    free (font->font_name);
     free (font->ps_name);
 fail2:
     free (font->subset_font_name);
 fail1:
+{
     cairo_int_status_t status;
     cff_header_t header;
     cairo_array_t *charstring;
     unsigned char buf[40];
-    unsigned char *end_buf;
+    unsigned char *end_buf, *end_buf2;
     unsigned int i;
+    int sid;
     /* Create header */
     header.major = 1;
     header.minor = 0;
     header.header_size = 4;
     header.offset_size = 4;
     font->header = &header;
+    /* Create Top Dict */
+    font->is_cid = FALSE;
+    snprintf((char*)buf, sizeof(buf), "CairoFont-%u-%u",
+	     font->scaled_font_subset->font_id,
+	     font->scaled_font_subset->subset_id);
+    sid = NUM_STD_STRINGS + _cairo_array_num_elements (&font->strings_subset_index);
+    status = cff_index_append_copy (&font->strings_subset_index,
+                                    (unsigned char *)buf,
+                                    strlen((char*)buf));
+    if (unlikely (status))
+	return status;
+    end_buf = encode_integer (buf, sid);
+    status = cff_dict_set_operands (font->top_dict, FULLNAME_OP,
+				    buf, end_buf - buf);
+    if (unlikely (status))
+	return status;
+    status = cff_dict_set_operands (font->top_dict, FAMILYNAME_OP,
+				    buf, end_buf - buf);
+    if (unlikely (status))
-    /* Create Top Dict */
+	return status;
     font->is_cid = FALSE;
     end_buf = encode_integer (buf, type2_subset->x_min);
     end_buf = encode_integer (end_buf, type2_subset->y_min);
     end_buf = encode_integer (end_buf, type2_subset->x_max);
     status = cff_dict_set_operands (font->top_dict,
 	                            CHARSTRINGS_OP, buf, end_buf - buf);
     if (unlikely (status))
 	return status;
+    if (font->scaled_font_subset->is_latin) {
+	status = cff_dict_set_operands (font->top_dict,
+                                        ENCODING_OP, buf, end_buf - buf);
+        if (unlikely (status))
+	    return status;
+	/* Private has two operands - size and offset */
+	end_buf2 = encode_integer_max (end_buf, 0);
+	cff_dict_set_operands (font->top_dict, PRIVATE_OP, buf, end_buf2 - buf);
+        if (unlikely (status))
+	    return status;
     } else {
-    status = cff_dict_set_operands (font->top_dict,
+	status = cff_dict_set_operands (font->top_dict,
-	                            FDSELECT_OP, buf, end_buf - buf);
+					FDSELECT_OP, buf, end_buf - buf);
-    if (unlikely (status))
+	if (unlikely (status))
-	return status;
+	    return status;
-    status = cff_dict_set_operands (font->top_dict,
+	status = cff_dict_set_operands (font->top_dict,
-	                            FDARRAY_OP, buf, end_buf - buf);
+					FDARRAY_OP, buf, end_buf - buf);
+	if (unlikely (status))
-    if (unlikely (status))
+	    return status;
 	return status;
     status = cff_dict_set_operands (font->top_dict,
+	                            CHARSET_OP, buf, end_buf - buf);
-	                            CHARSET_OP, buf, end_buf - buf);
+    if (unlikely (status))
-    if (unlikely (status))
+	return status;
 	return status;
     if (!font->scaled_font_subset->is_latin) {
-    status = cairo_cff_font_set_ros_strings (font);
+	status = cairo_cff_font_set_ros_strings (font);
-    if (unlikely (status))
+	if (unlikely (status))
-	return status;
+	    return status;
+	/* Create CID FD dictionary */
+	status = cairo_cff_font_create_cid_fontdict (font);
+	if (unlikely (status))
+	    return status;
     } else {
-    /* Create CID FD dictionary */
+	font->private_dict_offset = malloc (sizeof (int));
-    status = cairo_cff_font_create_cid_fontdict (font);
+	if (unlikely (font->private_dict_offset == NULL))
         if (unlikely (status))
             return status;
+    }
+    if (font->scaled_font_subset->is_latin)
 	status = cairo_cff_font_add_euro_charset_string (font);
     status = cairo_cff_font_write_subset (font);
     if (unlikely (status))
     status = cairo_cff_font_fallback_generate (font, &type2_subset, &data, &length);
     if (unlikely (status))
 	goto fail2;
-    cff_subset->font_name = NULL;
+    cff_subset->family_name_utf8 = NULL;
     cff_subset->ps_name = strdup (font->ps_name);
     if (unlikely (cff_subset->ps_name == NULL)) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto fail4;
+    }
     memcpy (cff_subset->data, data, length);
-    cff_subset->data_length = length;
     cff_subset->data_length = length;
     _cairo_type2_charstrings_fini (&type2_subset);

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/cairo/src/cairo-cff-subset.c – Rev 1897 → 3959