Merge pull request #6056 from harfbuzz/paint-fill-glyph

Fix hb-vector rendering of COLRv0 layers with huge font scales
This commit is contained in:
Behdad Esfahbod authored and GitHub committed 2026-07-14 12:32:22 -06:00
commit 8d2d5174ea
40 files changed
+810 -401

No files matched your search

+3
View File
@@ -266,6 +266,8 @@ hb_paint_pop_transform_func_t
hb_paint_funcs_set_pop_transform_func
hb_paint_color_glyph_func_t
hb_paint_funcs_set_color_glyph_func
hb_paint_fill_glyph_func_t
hb_paint_funcs_set_fill_glyph_func
hb_paint_push_clip_glyph_func_t
hb_paint_funcs_set_push_clip_glyph_func
hb_paint_push_clip_rectangle_func_t
@@ -311,6 +313,7 @@ hb_paint_push_font_transform
hb_paint_push_inverse_font_transform
hb_paint_pop_transform
hb_paint_color_glyph
hb_paint_fill_glyph
hb_paint_push_clip_glyph
hb_paint_push_clip_rectangle
hb_paint_push_clip_path_start
+59 -17
View File
@@ -335,6 +335,12 @@ struct Variable
value.get_color_stop (c, stop, varIdxBase, instancer);
}
void get_solid_color (hb_paint_context_t *c,
hb_bool_t *is_foreground, hb_color_t *color) const
{
value.get_solid_color (c, varIdxBase, is_foreground, color);
}
hb_paint_extend_t get_extend () const
{
return value.get_extend ();
@@ -390,6 +396,12 @@ struct NoVariable
value.get_color_stop (c, stop, VarIdx::NO_VARIATION, instancer);
}
void get_solid_color (hb_paint_context_t *c,
hb_bool_t *is_foreground, hb_color_t *color) const
{
value.get_solid_color (c, VarIdx::NO_VARIATION, is_foreground, color);
}
hb_paint_extend_t get_extend () const
{
return value.get_extend ();
@@ -680,15 +692,21 @@ struct PaintSolid
return_trace (c->check_struct (this));
}
void get_solid_color (hb_paint_context_t *c, uint32_t varIdxBase,
hb_bool_t *is_foreground, hb_color_t *color) const
{
*color = c->get_color (paletteIndex,
alpha.to_float (c->instancer (varIdxBase, 0)),
is_foreground);
}
void paint_glyph (hb_paint_context_t *c, uint32_t varIdxBase) const
{
TRACE_PAINT (this);
hb_bool_t is_foreground;
hb_color_t color;
color = c->get_color (paletteIndex,
alpha.to_float (c->instancer (varIdxBase, 0)),
&is_foreground);
get_solid_color (c, varIdxBase, &is_foreground, &color);
c->funcs->color (c->data, is_foreground, color);
}
@@ -928,17 +946,7 @@ struct PaintGlyph
return_trace (c->check_struct (this) && paint.sanitize (c, this));
}
void paint_glyph (hb_paint_context_t *c) const
{
TRACE_PAINT (this);
c->funcs->push_inverse_font_transform (c->data, c->font);
c->funcs->push_clip_glyph (c->data, gid, c->font);
c->funcs->push_font_transform (c->data, c->font);
c->recurse (this+paint);
c->funcs->pop_transform (c->data);
c->funcs->pop_clip (c->data);
c->funcs->pop_transform (c->data);
}
inline void paint_glyph (hb_paint_context_t *c) const;
HBUINT8 format; /* format = 10 */
Offset24To<Paint> paint; /* Offset (from beginning of PaintGlyph table) to Paint subtable. */
@@ -1892,6 +1900,16 @@ struct Paint
}
}
bool get_solid_color (hb_paint_context_t *c,
hb_bool_t *is_foreground, hb_color_t *color) const
{
switch (u.format.v) {
case 2: u.paintformat2.get_solid_color (c, is_foreground, color); return true;
case 3: u.paintformat3.get_solid_color (c, is_foreground, color); return true;
default: return false;
}
}
protected:
union {
struct { HBUINT8 v; } format;
@@ -2761,9 +2779,7 @@ struct COLR
{
hb_bool_t is_foreground;
hb_color_t color = c.get_color (r.colorIdx, 1., &is_foreground);
c.funcs->push_clip_glyph (c.data, r.glyphId, c.font);
c.funcs->color (c.data, is_foreground, color);
c.funcs->pop_clip (c.data);
c.funcs->fill_glyph (c.data, r.glyphId, c.font, is_foreground, color);
}
return true;
@@ -2805,6 +2821,32 @@ hb_paint_context_t::recurse (const Paint &paint)
depth_left++;
}
void PaintGlyph::paint_glyph (hb_paint_context_t *c) const
{
TRACE_PAINT (this);
hb_bool_t is_foreground;
hb_color_t color;
/* Optimize cases that can use a simple fill-glyph operation. */
if (likely (c->depth_left > 0 && c->edge_count > 0) &&
(this+paint).get_solid_color (c, &is_foreground, &color))
{
c->edge_count--;
c->funcs->push_inverse_font_transform (c->data, c->font);
c->funcs->fill_glyph (c->data, gid, c->font, is_foreground, color);
c->funcs->pop_transform (c->data);
return;
}
c->funcs->push_inverse_font_transform (c->data, c->font);
c->funcs->push_clip_glyph (c->data, gid, c->font);
c->funcs->push_font_transform (c->data, c->font);
c->recurse (this+paint);
c->funcs->pop_transform (c->data);
c->funcs->pop_clip (c->data);
c->funcs->pop_transform (c->data);
}
void PaintColrLayers::paint_glyph (hb_paint_context_t *c) const
{
TRACE_PAINT (this);
+26
View File
@@ -94,6 +94,32 @@ _hb_cairo_destroy_blob (void *p)
hb_blob_destroy ((hb_blob_t *) p);
}
void
_hb_cairo_set_source_color (hb_cairo_context_t *c,
hb_bool_t use_foreground,
hb_color_t color)
{
cairo_t *cr = c->cr;
if (use_foreground)
{
#ifdef HAVE_CAIRO_USER_SCALED_FONT_GET_FOREGROUND_SOURCE
double r, g, b, a;
cairo_pattern_t *foreground = cairo_user_scaled_font_get_foreground_source (c->scaled_font);
if (cairo_pattern_get_rgba (foreground, &r, &g, &b, &a) == CAIRO_STATUS_SUCCESS)
cairo_set_source_rgba (cr, r, g, b, a * hb_color_get_alpha (color) / 255.);
else
#endif
cairo_set_source_rgba (cr, 0, 0, 0, hb_color_get_alpha (color) / 255.);
}
else
cairo_set_source_rgba (cr,
hb_color_get_red (color) / 255.,
hb_color_get_green (color) / 255.,
hb_color_get_blue (color) / 255.,
hb_color_get_alpha (color) / 255.);
}
hb_bool_t
_hb_cairo_paint_glyph_image (hb_cairo_context_t *c,
hb_blob_t *blob,
+5
View File
@@ -75,6 +75,11 @@ _hb_paint_composite_mode_to_cairo (hb_paint_composite_mode_t mode)
}
}
HB_INTERNAL void
_hb_cairo_set_source_color (hb_cairo_context_t *c,
hb_bool_t use_foreground,
hb_color_t color);
HB_INTERNAL hb_bool_t
_hb_cairo_paint_glyph_image (hb_cairo_context_t *c,
hb_blob_t *blob,
+28 -21
View File
@@ -166,6 +166,29 @@ hb_cairo_pop_transform (hb_paint_funcs_t *pfuncs HB_UNUSED,
cairo_restore (cr);
}
static void
hb_cairo_fill_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t use_foreground,
hb_color_t color,
void *user_data HB_UNUSED)
{
hb_cairo_context_t *c = (hb_cairo_context_t *) paint_data;
cairo_t *cr = c->cr;
cairo_save (cr);
cairo_new_path (cr);
hb_font_draw_glyph (font, glyph, hb_cairo_draw_get_funcs (), cr);
cairo_close_path (cr);
_hb_cairo_set_source_color (c, use_foreground, color);
cairo_fill (cr);
cairo_restore (cr);
}
static hb_bool_t
hb_cairo_paint_color_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
void *paint_data,
@@ -303,23 +326,7 @@ hb_cairo_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
hb_cairo_context_t *c = (hb_cairo_context_t *) paint_data;
cairo_t *cr = c->cr;
if (use_foreground)
{
#ifdef HAVE_CAIRO_USER_SCALED_FONT_GET_FOREGROUND_SOURCE
double r, g, b, a;
cairo_pattern_t *foreground = cairo_user_scaled_font_get_foreground_source (c->scaled_font);
if (cairo_pattern_get_rgba (foreground, &r, &g, &b, &a) == CAIRO_STATUS_SUCCESS)
cairo_set_source_rgba (cr, r, g, b, a * hb_color_get_alpha (color) / 255.);
else
#endif
cairo_set_source_rgba (cr, 0, 0, 0, hb_color_get_alpha (color) / 255.);
}
else
cairo_set_source_rgba (cr,
hb_color_get_red (color) / 255.,
hb_color_get_green (color) / 255.,
hb_color_get_blue (color) / 255.,
hb_color_get_alpha (color) / 255.);
_hb_cairo_set_source_color (c, use_foreground, color);
cairo_paint (cr);
}
@@ -452,6 +459,7 @@ static struct hb_cairo_paint_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_t<
hb_paint_funcs_set_push_transform_func (funcs, hb_cairo_push_transform, nullptr, nullptr);
hb_paint_funcs_set_pop_transform_func (funcs, hb_cairo_pop_transform, nullptr, nullptr);
hb_paint_funcs_set_fill_glyph_func (funcs, hb_cairo_fill_glyph, nullptr, nullptr);
hb_paint_funcs_set_color_glyph_func (funcs, hb_cairo_paint_color_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_glyph_func (funcs, hb_cairo_push_clip_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_rectangle_func (funcs, hb_cairo_push_clip_rectangle, nullptr, nullptr);
@@ -675,10 +683,9 @@ hb_cairo_render_color_glyph (cairo_scaled_font_t *scaled_font,
c.color_cache = (hb_map_t *) cairo_scaled_font_get_user_data (scaled_font, &color_cache_key);
/* Synthesizing variant: mono glyphs render here too via the
* push_clip_glyph + foreground-fill fallback inside
* hb_font_paint_glyph. Callers that want the cheaper
* outline path for mono fonts set CAIRO_COLOR_MODE_NO_COLOR
* on the font options instead. */
* fill_glyph foreground fallback inside hb_font_paint_glyph.
* Callers that want the cheaper outline path for mono fonts set
* CAIRO_COLOR_MODE_NO_COLOR on the font options instead. */
hb_font_paint_glyph (font, glyph, hb_cairo_paint_get_funcs (), &c, palette, color);
return CAIRO_STATUS_SUCCESS;
+1 -3
View File
@@ -1670,9 +1670,7 @@ hb_font_t::paint_glyph (hb_codepoint_t glyph,
return;
/* Fallback for outline glyph. */
paint_funcs->push_clip_glyph (paint_data, glyph, this);
paint_funcs->color (paint_data, true, foreground);
paint_funcs->pop_clip (paint_data);
paint_funcs->fill_glyph (paint_data, glyph, this, true, foreground);
}
+59 -30
View File
@@ -250,6 +250,42 @@ _hb_ft_color_line_get_extend (hb_color_line_t *color_line,
}
}
static void
_hb_ft_get_solid_color (hb_ft_paint_context_t *c,
const FT_ColorIndex &color_index,
hb_bool_t *is_foreground,
hb_color_t *color)
{
*is_foreground = color_index.palette_index == 0xFFFF;
if (*is_foreground)
{
*color = HB_COLOR (hb_color_get_blue (c->foreground),
hb_color_get_green (c->foreground),
hb_color_get_red (c->foreground),
_hb_ft_color_alpha (hb_color_get_alpha (c->foreground),
color_index.alpha));
return;
}
if (c->funcs->custom_palette_color (c->data, color_index.palette_index, color))
{
*color = HB_COLOR (hb_color_get_blue (*color),
hb_color_get_green (*color),
hb_color_get_red (*color),
_hb_ft_color_alpha (hb_color_get_alpha (*color),
color_index.alpha));
return;
}
FT_Color ft_color = c->palette[color_index.palette_index];
*color = HB_COLOR (ft_color.blue,
ft_color.green,
ft_color.red,
_hb_ft_color_alpha (ft_color.alpha,
color_index.alpha));
}
void
_hb_ft_paint (hb_ft_paint_context_t *c,
FT_OpaquePaint opaque_paint)
@@ -280,34 +316,9 @@ _hb_ft_paint (hb_ft_paint_context_t *c,
break;
case FT_COLR_PAINTFORMAT_SOLID:
{
bool is_foreground = paint.u.solid.color.palette_index == 0xFFFF;
hb_bool_t is_foreground;
hb_color_t color;
if (is_foreground)
color = HB_COLOR (hb_color_get_blue (c->foreground),
hb_color_get_green (c->foreground),
hb_color_get_red (c->foreground),
_hb_ft_color_alpha (hb_color_get_alpha (c->foreground),
paint.u.solid.color.alpha));
else
{
if (c->funcs->custom_palette_color (c->data, paint.u.solid.color.palette_index, &color))
{
color = HB_COLOR (hb_color_get_blue (color),
hb_color_get_green (color),
hb_color_get_red (color),
_hb_ft_color_alpha (hb_color_get_alpha (color),
paint.u.solid.color.alpha));
}
else
{
FT_Color ft_color = c->palette[paint.u.solid.color.palette_index];
color = HB_COLOR (ft_color.blue,
ft_color.green,
ft_color.red,
_hb_ft_color_alpha (ft_color.alpha,
paint.u.solid.color.alpha));
}
}
_hb_ft_get_solid_color (c, paint.u.solid.color, &is_foreground, &color);
c->funcs->color (c->data, is_foreground, color);
}
break;
@@ -362,6 +373,26 @@ _hb_ft_paint (hb_ft_paint_context_t *c,
break;
case FT_COLR_PAINTFORMAT_GLYPH:
{
/* Optimize cases that can use a simple fill-glyph operation. */
FT_COLR_Paint fill;
if (likely (c->depth_left > 0 && c->edge_count > 0) &&
FT_Get_Paint (ft_face, paint.u.glyph.paint, &fill) &&
fill.format == FT_COLR_PAINTFORMAT_SOLID)
{
hb_bool_t is_foreground;
hb_color_t color;
_hb_ft_get_solid_color (c, fill.u.solid.color, &is_foreground, &color);
c->edge_count--;
c->funcs->push_inverse_font_transform (c->data, c->font);
c->ft_font->lock.unlock ();
c->funcs->fill_glyph (c->data, paint.u.glyph.glyphID, c->font,
is_foreground, color);
c->ft_font->lock.lock ();
c->funcs->pop_transform (c->data);
break;
}
c->funcs->push_inverse_font_transform (c->data, c->font);
c->ft_font->lock.unlock ();
c->funcs->push_clip_glyph (c->data, paint.u.glyph.glyphID, c->font);
@@ -600,10 +631,8 @@ hb_ft_paint_glyph_colr (hb_font_t *font,
}
ft_font->lock.unlock ();
paint_funcs->push_clip_glyph (paint_data, layer_glyph_index, font);
paint_funcs->fill_glyph (paint_data, layer_glyph_index, font, is_foreground, color);
ft_font->lock.lock ();
paint_funcs->color (paint_data, is_foreground, color);
paint_funcs->pop_clip (paint_data);
} while (FT_Get_Color_Glyph_Layer(ft_face,
gid,
+38
View File
@@ -60,6 +60,20 @@ hb_paint_color_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data,
hb_font_t *font,
void *user_data) { return false; }
static void
hb_paint_fill_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t is_foreground,
hb_color_t color,
void *user_data)
{
/* Decompose into the equivalent general sequence. */
funcs->push_clip_glyph (paint_data, glyph, font);
funcs->color (paint_data, is_foreground, color);
funcs->pop_clip (paint_data);
}
static void
hb_paint_push_clip_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data,
hb_codepoint_t glyph,
@@ -551,6 +565,30 @@ hb_paint_color_glyph (hb_paint_funcs_t *funcs, void *paint_data,
return funcs->color_glyph (paint_data, glyph, font);
}
/**
* hb_paint_fill_glyph:
* @funcs: paint functions
* @paint_data: associated data passed by the caller
* @glyph: the glyph ID
* @font: the font
* @is_foreground: whether the color is the foreground
* @color: The color to use
*
* Perform a "fill-glyph" paint operation: fill the glyph's shape
* with a solid color.
*
* XSince: REPLACEME
*/
void
hb_paint_fill_glyph (hb_paint_funcs_t *funcs, void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t is_foreground,
hb_color_t color)
{
funcs->fill_glyph (paint_data, glyph, font, is_foreground, color);
}
/**
* hb_paint_push_clip_glyph:
* @funcs: paint functions
+49
View File
@@ -157,6 +157,31 @@ typedef hb_bool_t (*hb_paint_color_glyph_func_t) (hb_paint_funcs_t *funcs,
hb_font_t *font,
void *user_data);
/**
* hb_paint_fill_glyph_func_t:
* @funcs: paint functions object
* @paint_data: The data accompanying the paint functions in hb_font_paint_glyph()
* @glyph: the glyph ID
* @font: the font
* @is_foreground: whether the color is the foreground
* @color: The color to use, unpremultiplied
* @user_data: User data pointer passed to hb_paint_funcs_set_fill_glyph_func()
*
* A virtual method for the #hb_paint_funcs_t to fill a glyph's shape with
* a solid color. If not implemented, a sequence of "push-clip-glyph",
* "color", "pop-clip" paint operations, in that order, will be emitted
* instead.
*
* XSince: REPLACEME
*/
typedef void (*hb_paint_fill_glyph_func_t) (hb_paint_funcs_t *funcs,
void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t is_foreground,
hb_color_t color,
void *user_data);
/**
* hb_paint_push_clip_glyph_func_t:
* @funcs: paint functions object
@@ -854,6 +879,23 @@ hb_paint_funcs_set_color_glyph_func (hb_paint_funcs_t *funcs,
void *user_data,
hb_destroy_func_t destroy);
/**
* hb_paint_funcs_set_fill_glyph_func:
* @funcs: A paint functions struct
* @func: (closure user_data) (destroy destroy) (scope notified): The fill-glyph callback
* @user_data: Data to pass to @func
* @destroy: (nullable): Function to call when @user_data is no longer needed
*
* Sets the fill-glyph callback on the paint functions struct.
*
* XSince: REPLACEME
*/
HB_EXTERN void
hb_paint_funcs_set_fill_glyph_func (hb_paint_funcs_t *funcs,
hb_paint_fill_glyph_func_t func,
void *user_data,
hb_destroy_func_t destroy);
/**
* hb_paint_funcs_set_push_clip_glyph_func:
* @funcs: A paint functions struct
@@ -1117,6 +1159,13 @@ hb_paint_color_glyph (hb_paint_funcs_t *funcs, void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font);
HB_EXTERN void
hb_paint_fill_glyph (hb_paint_funcs_t *funcs, void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t is_foreground,
hb_color_t color);
HB_EXTERN void
hb_paint_push_clip_glyph (hb_paint_funcs_t *funcs, void *paint_data,
hb_codepoint_t glyph,
+10
View File
@@ -48,6 +48,7 @@
HB_PAINT_FUNC_IMPLEMENT (push_group_for) \
HB_PAINT_FUNC_IMPLEMENT (pop_group) \
HB_PAINT_FUNC_IMPLEMENT (custom_palette_color) \
HB_PAINT_FUNC_IMPLEMENT (fill_glyph) \
/* ^--- Add new callbacks here */
struct hb_paint_funcs_t
@@ -121,6 +122,15 @@ struct hb_paint_funcs_t
{ func.color (this, paint_data,
is_foreground, color,
!user_data ? nullptr : user_data->color); }
void fill_glyph (void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t is_foreground,
hb_color_t color)
{ func.fill_glyph (this, paint_data,
glyph, font,
is_foreground, color,
!user_data ? nullptr : user_data->fill_glyph); }
bool image (void *paint_data,
hb_blob_t *image,
unsigned width, unsigned height,
+125 -30
View File
@@ -196,6 +196,35 @@ hb_raster_paint_push_empty_clip (hb_raster_paint_t *c, unsigned w, unsigned h)
(void) c->clip_stack.push (std::move (new_clip));
}
static bool
hb_raster_paint_intersect_mask (const hb_raster_image_t *surf,
const hb_raster_extents_t &mask_ext,
const hb_raster_clip_t &clip,
unsigned w, unsigned h,
int64_t *mask_x0, int64_t *mask_y0,
unsigned *ix0, unsigned *iy0,
unsigned *ix1, unsigned *iy1)
{
/* Convert mask extents from surface coordinates to clip-buffer coordinates. */
int64_t mx0 = (int64_t) mask_ext.x_origin - (int64_t) surf->extents.x_origin;
int64_t my0 = (int64_t) mask_ext.y_origin - (int64_t) surf->extents.y_origin;
int64_t x0 = hb_max ((int64_t) clip.min_x, hb_max (mx0, (int64_t) 0));
int64_t y0 = hb_max ((int64_t) clip.min_y, hb_max (my0, (int64_t) 0));
int64_t x1 = hb_min ((int64_t) clip.max_x, hb_min (mx0 + mask_ext.width, (int64_t) w));
int64_t y1 = hb_min ((int64_t) clip.max_y, hb_min (my0 + mask_ext.height, (int64_t) h));
if (x0 >= x1 || y0 >= y1) return false;
*mask_x0 = mx0;
*mask_y0 = my0;
*ix0 = (unsigned) x0;
*iy0 = (unsigned) y0;
*ix1 = (unsigned) x1;
*iy1 = (unsigned) y1;
return true;
}
/* Render whatever edges have been accumulated into @rdr and
* push the result as a new clip on the stack, intersecting
* with the existing clip. Used by the emitter-based clip
@@ -239,29 +268,17 @@ hb_raster_paint_finalize_path_clip (hb_raster_paint_t *c,
return;
}
/* Convert mask extents from surface coordinates to clip-buffer coordinates. */
int64_t mask_x0 = (int64_t) mask_ext.x_origin - (int64_t) surf->extents.x_origin;
int64_t mask_y0 = (int64_t) mask_ext.y_origin - (int64_t) surf->extents.y_origin;
int64_t mask_x1 = mask_x0 + mask_ext.width;
int64_t mask_y1 = mask_y0 + mask_ext.height;
int64_t ix0_i = hb_max ((int64_t) old_clip.min_x, hb_max (mask_x0, (int64_t) 0));
int64_t iy0_i = hb_max ((int64_t) old_clip.min_y, hb_max (mask_y0, (int64_t) 0));
int64_t ix1_i = hb_min ((int64_t) old_clip.max_x, hb_min (mask_x1, (int64_t) w));
int64_t iy1_i = hb_min ((int64_t) old_clip.max_y, hb_min (mask_y1, (int64_t) h));
if (ix0_i >= ix1_i || iy0_i >= iy1_i)
int64_t mask_x0, mask_y0;
unsigned ix0, iy0, ix1, iy1;
if (!hb_raster_paint_intersect_mask (surf, mask_ext, old_clip, w, h,
&mask_x0, &mask_y0,
&ix0, &iy0, &ix1, &iy1))
{
hb_raster_draw_recycle_image (rdr, mask_img);
hb_raster_paint_push_empty_clip (c, w, h);
return;
}
unsigned ix0 = (unsigned) ix0_i;
unsigned iy0 = (unsigned) iy0_i;
unsigned ix1 = (unsigned) ix1_i;
unsigned iy1 = (unsigned) iy1_i;
new_clip.min_x = w; new_clip.min_y = h;
new_clip.max_x = 0; new_clip.max_y = 0;
@@ -697,19 +714,11 @@ hb_raster_paint_pop_group (hb_paint_funcs_t *pfuncs HB_UNUSED,
}
static void
hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
void *paint_data,
hb_bool_t is_foreground HB_UNUSED,
hb_raster_paint_solid (hb_raster_paint_t *c,
hb_raster_image_t *surf,
hb_color_t color,
void *user_data HB_UNUSED)
hb_raster_image_t *mask_img)
{
hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
ensure_initialized (c);
hb_raster_image_t *surf = c->current_surface ();
if (unlikely (!surf)) return;
uint32_t premul = color_to_premul_pixel (color);
uint8_t premul_a = (uint8_t) (premul >> 24);
const hb_raster_clip_t &clip = c->current_clip ();
@@ -718,15 +727,36 @@ hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
if (clip.min_x >= clip.max_x || clip.min_y >= clip.max_y) return;
if (premul_a == 0) return;
unsigned ix0 = clip.min_x, iy0 = clip.min_y;
unsigned ix1 = clip.max_x, iy1 = clip.max_y;
const uint8_t *mask_buf = nullptr;
hb_raster_extents_t mask_ext;
int64_t mask_x0 = 0, mask_y0 = 0;
if (mask_img)
{
mask_buf = hb_raster_image_get_buffer (mask_img);
hb_raster_image_get_extents (mask_img, &mask_ext);
if (!hb_raster_paint_intersect_mask (surf, mask_ext, clip,
surf->extents.width, surf->extents.height,
&mask_x0, &mask_y0,
&ix0, &iy0, &ix1, &iy1))
return;
}
if (likely (!clip.is_rect))
{
for (unsigned y = clip.min_y; y < clip.max_y; y++)
for (unsigned y = iy0; y < iy1; y++)
{
hb_packed_t<uint32_t> *__restrict row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + y * stride);
const uint8_t *__restrict clip_row = clip.alpha.arrayZ + y * clip.stride;
for (unsigned x = clip.min_x; x < clip.max_x; x++)
const uint8_t *__restrict mask_row = mask_buf ? mask_buf + (unsigned) ((int64_t) y - mask_y0) * mask_ext.stride
: nullptr;
unsigned mx = (unsigned) ((int64_t) ix0 - mask_x0);
for (unsigned x = ix0; x < ix1; x++)
{
uint8_t clip_alpha = clip_row[x];
if (mask_row)
clip_alpha = hb_raster_div255 (mask_row[mx++] * clip_alpha);
if (clip_alpha == 0) continue;
if (clip_alpha == 255)
{
@@ -743,6 +773,22 @@ hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
}
}
}
else if (mask_buf)
{
for (unsigned y = iy0; y < iy1; y++)
{
hb_packed_t<uint32_t> *__restrict row = (hb_packed_t<uint32_t> *) (surf->buffer.arrayZ + y * stride);
const uint8_t *__restrict mask_row = mask_buf + (unsigned) ((int64_t) y - mask_y0) * mask_ext.stride;
unsigned mx = (unsigned) ((int64_t) ix0 - mask_x0);
for (unsigned x = ix0; x < ix1; x++)
{
uint8_t mask_alpha = mask_row[mx++];
if (mask_alpha == 0) continue;
uint32_t src = hb_raster_alpha_mul (premul, mask_alpha);
row[x] = hb_packed_t<uint32_t> (hb_raster_src_over (src, (uint32_t) row[x]));
}
}
}
else
{
for (unsigned y = clip.min_y; y < clip.max_y; y++)
@@ -754,6 +800,54 @@ hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
}
}
static void
hb_raster_paint_color (hb_paint_funcs_t *pfuncs HB_UNUSED,
void *paint_data,
hb_bool_t is_foreground HB_UNUSED,
hb_color_t color,
void *user_data HB_UNUSED)
{
hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
ensure_initialized (c);
hb_raster_image_t *surf = c->current_surface ();
if (unlikely (!surf)) return;
hb_raster_paint_solid (c, surf, color, nullptr);
}
static void
hb_raster_paint_fill_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t is_foreground HB_UNUSED,
hb_color_t color,
void *user_data HB_UNUSED)
{
hb_raster_paint_t *c = (hb_raster_paint_t *) paint_data;
ensure_initialized (c);
hb_raster_image_t *surf = c->current_surface ();
if (unlikely (!surf)) return;
hb_raster_draw_t *rdr = c->clip_rdr;
hb_transform_t<> t = c->current_effective_transform ();
hb_raster_draw_set_transform (rdr, t.xx, t.yx, t.xy, t.yy, t.x0, t.y0);
hb_raster_paint_glyph_clip_data_t data = {glyph, font};
hb_raster_paint_emit_clip_glyph_mask (rdr, &data);
hb_raster_image_t *mask_img = hb_raster_draw_render (rdr);
if (unlikely (!mask_img)) return;
hb_raster_paint_solid (c, surf, color, mask_img);
hb_raster_draw_recycle_image (rdr, mask_img);
}
static hb_bool_t
hb_raster_paint_image (hb_paint_funcs_t *pfuncs HB_UNUSED,
void *paint_data,
@@ -1645,6 +1739,7 @@ static struct hb_raster_paint_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_t
hb_paint_funcs_set_push_transform_func (funcs, hb_raster_paint_push_transform, nullptr, nullptr);
hb_paint_funcs_set_pop_transform_func (funcs, hb_raster_paint_pop_transform, nullptr, nullptr);
hb_paint_funcs_set_fill_glyph_func (funcs, hb_raster_paint_fill_glyph, nullptr, nullptr);
hb_paint_funcs_set_color_glyph_func (funcs, hb_raster_paint_color_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_glyph_func (funcs, hb_raster_paint_push_clip_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_rectangle_func (funcs, hb_raster_paint_push_clip_rectangle, nullptr, nullptr);
+56 -3
View File
@@ -392,6 +392,58 @@ hb_pdf_paint_pop_transform (hb_paint_funcs_t *,
paint->current_body ().append_str ("Q\n");
}
static void
hb_pdf_paint_fill_glyph (hb_paint_funcs_t *,
void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t,
hb_color_t c,
void *)
{
auto *paint = (hb_vector_paint_t *) paint_data;
if (unlikely (!paint->ensure_initialized ()))
return;
float r = hb_color_get_red (c) / 255.f;
float g = hb_color_get_green (c) / 255.f;
float b = hb_color_get_blue (c) / 255.f;
float a = hb_color_get_alpha (c) / 255.f;
if (a < 1.f / 255.f)
return;
auto &body = paint->current_body ();
bool scoped = false;
/* Set alpha via ExtGState if needed, scoped so it does not leak
* into later paints. */
if (a < 1.f - 1.f / 512.f)
{
auto *res = hb_pdf_get_resources (paint);
if (res)
{
unsigned gs_idx = res->add_extgstate_alpha (a);
body.append_str ("q\n");
scoped = true;
body.append_str ("/GS");
body.append_unsigned (gs_idx);
body.append_str (" gs\n");
}
}
body.append_num (r, 4);
body.append_c (' ');
body.append_num (g, 4);
body.append_c (' ');
body.append_num (b, 4);
body.append_str (" rg\n");
hb_pdf_emit_glyph_path (paint, font, glyph, &body);
body.append_str ("f\n");
if (scoped)
body.append_str ("Q\n");
}
static void
hb_pdf_paint_push_clip_glyph (hb_paint_funcs_t *,
void *paint_data,
@@ -1534,6 +1586,7 @@ static struct hb_pdf_paint_funcs_lazy_loader_t
hb_paint_funcs_t *funcs = hb_paint_funcs_create ();
hb_paint_funcs_set_push_transform_func (funcs, (hb_paint_push_transform_func_t) hb_pdf_paint_push_transform, nullptr, nullptr);
hb_paint_funcs_set_pop_transform_func (funcs, (hb_paint_pop_transform_func_t) hb_pdf_paint_pop_transform, nullptr, nullptr);
hb_paint_funcs_set_fill_glyph_func (funcs, (hb_paint_fill_glyph_func_t) hb_pdf_paint_fill_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_glyph_func (funcs, (hb_paint_push_clip_glyph_func_t) hb_pdf_paint_push_clip_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_rectangle_func (funcs, (hb_paint_push_clip_rectangle_func_t) hb_pdf_paint_push_clip_rectangle, nullptr, nullptr);
hb_paint_funcs_set_push_clip_path_start_func (funcs, (hb_paint_push_clip_path_start_func_t) hb_pdf_paint_push_clip_path_start, nullptr, nullptr);
@@ -1612,11 +1665,11 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint)
out.append_str ("3 0 obj\n<< /Type /Page /Parent 2 0 R /MediaBox [");
out.append_num (ex);
out.append_c (' ');
out.append_num (-(ey + eh));
out.append_num (ey);
out.append_c (' ');
out.append_num (ex + ew);
out.append_c (' ');
out.append_num (-ey);
out.append_num (ey + eh);
out.append_str ("]\n/Contents 4 0 R");
/* Resources. */
@@ -1674,7 +1727,7 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint)
bg_prefix.append_str (" rg\n");
bg_prefix.append_num (ex);
bg_prefix.append_c (' ');
bg_prefix.append_num (-(ey + eh));
bg_prefix.append_num (ey);
bg_prefix.append_c (' ');
bg_prefix.append_num (ew);
bg_prefix.append_c (' ');
+28
View File
@@ -268,6 +268,7 @@ static void hb_vector_paint_push_transform (hb_paint_funcs_t *, void *,
float, float, float, float, float, float,
void *);
static void hb_vector_paint_pop_transform (hb_paint_funcs_t *, void *, void *);
static void hb_vector_paint_fill_glyph (hb_paint_funcs_t *, void *, hb_codepoint_t, hb_font_t *, hb_bool_t, hb_color_t, void *);
static void hb_vector_paint_push_clip_glyph (hb_paint_funcs_t *, void *, hb_codepoint_t, hb_font_t *, void *);
static void hb_vector_paint_push_clip_rectangle (hb_paint_funcs_t *, void *, float, float, float, float, void *);
static hb_draw_funcs_t * hb_vector_paint_push_clip_path_start (hb_paint_funcs_t *, void *, void **, void *);
@@ -308,6 +309,7 @@ static struct hb_vector_paint_funcs_lazy_loader_t
hb_paint_funcs_t *funcs = hb_paint_funcs_create ();
hb_paint_funcs_set_push_transform_func (funcs, (hb_paint_push_transform_func_t) hb_vector_paint_push_transform, nullptr, nullptr);
hb_paint_funcs_set_pop_transform_func (funcs, (hb_paint_pop_transform_func_t) hb_vector_paint_pop_transform, nullptr, nullptr);
hb_paint_funcs_set_fill_glyph_func (funcs, (hb_paint_fill_glyph_func_t) hb_vector_paint_fill_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_glyph_func (funcs, (hb_paint_push_clip_glyph_func_t) hb_vector_paint_push_clip_glyph, nullptr, nullptr);
hb_paint_funcs_set_push_clip_rectangle_func (funcs, (hb_paint_push_clip_rectangle_func_t) hb_vector_paint_push_clip_rectangle, nullptr, nullptr);
hb_paint_funcs_set_push_clip_path_start_func (funcs, (hb_paint_push_clip_path_start_func_t) hb_vector_paint_push_clip_path_start, nullptr, nullptr);
@@ -413,6 +415,32 @@ hb_vector_paint_pop_transform (hb_paint_funcs_t *,
paint->current_body ().append_str ("</g>\n");
}
static void
hb_vector_paint_fill_glyph (hb_paint_funcs_t *,
void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font,
hb_bool_t,
hb_color_t color,
void *)
{
auto *paint = (hb_vector_paint_t *) paint_data;
if (unlikely (!paint->ensure_initialized ()))
return;
paint->path.clear ();
hb_vector_path_sink_t sink = {&paint->path, paint->get_precision (),
paint->x_scale_factor, paint->y_scale_factor};
hb_font_draw_glyph (font, glyph, hb_vector_svg_path_draw_funcs_get (), &sink);
auto &body = paint->current_body ();
body.append_str ("<path d=\"");
body.append_len (paint->path.arrayZ, paint->path.length);
body.append_str ("\" fill=\"");
body.append_svg_color (color, true);
body.append_str ("\"/>\n");
}
static void
hb_vector_paint_push_clip_glyph (hb_paint_funcs_t *,
void *paint_data,
+26
View File
@@ -701,6 +701,32 @@ impl ColorPainter for HbColorPainter<'_> {
) {
unsafe {
hb_paint_push_inverse_font_transform(self.paint_funcs, self.paint_data, self.font);
}
if brush_transform.is_none() {
if let Brush::Solid {
palette_index: color_index,
alpha,
} = brush
{
let is_foreground = color_index == 0xFFFF;
let color = self.lookup_color(color_index, alpha);
unsafe {
hb_paint_fill_glyph(
self.paint_funcs,
self.paint_data,
glyph_id.to_u32() as hb_codepoint_t,
self.font,
is_foreground as hb_bool_t,
color,
);
}
self.pop_transform();
return;
}
}
unsafe {
hb_paint_push_clip_glyph(
self.paint_funcs,
self.paint_data,
+1 -5
View File
@@ -3,11 +3,7 @@ start transform 1 0 0 1 0 0
push group
push group
start transform 1 0 0 1 0 0
start clip glyph 159
start transform 1 0 0 1 0 0
solid 128 128 128 102
end transform
end clip
fill glyph 159 solid 128 128 128 102
end transform
pop group mode 3
pop group mode 3
+5 -25
View File
@@ -29,25 +29,13 @@ start transform 1 0 0 1 0 0
end clip
end transform
start transform 1 0 0 1 0 0
start clip glyph 15
start transform 1 0 0 1 0 0
solid 145 103 77 255
end transform
end clip
fill glyph 15 solid 145 103 77 255
end transform
start transform 1 0 0 1 0 0
start clip glyph 16
start transform 1 0 0 1 0 0
solid 30 136 229 255
end transform
end clip
fill glyph 16 solid 30 136 229 255
end transform
start transform 1 0 0 1 0 0
start clip glyph 21
start transform 1 0 0 1 0 0
solid 145 103 77 255
end transform
end clip
fill glyph 21 solid 145 103 77 255
end transform
start transform 1 0 0 1 0 0
start clip glyph 16
@@ -62,11 +50,7 @@ start transform 1 0 0 1 0 0
end clip
end transform
start transform 1 0 0 1 0 0
start clip glyph 18
start transform 1 0 0 1 0 0
solid 66 66 66 51
end transform
end clip
fill glyph 18 solid 66 66 66 51
end transform
start transform 1 0 0 1 0 0
start clip glyph 19
@@ -85,11 +69,7 @@ start transform 1 0 0 1 0 0
end clip
end transform
start transform 1 0 0 1 0 0
start clip glyph 20
start transform 1 0 0 1 0 0
solid 145 103 77 255
end transform
end clip
fill glyph 20 solid 145 103 77 255
end transform
end clip
end transform
+5 -25
View File
@@ -30,25 +30,13 @@ start transform 1 0 0.2 1 0 0
end clip
end transform
start transform 1 0 0 1 0 0
start clip glyph 15
start transform 1 0 0 1 0 0
solid 145 103 77 255
end transform
end clip
fill glyph 15 solid 145 103 77 255
end transform
start transform 1 0 0 1 0 0
start clip glyph 16
start transform 1 0 0 1 0 0
solid 30 136 229 255
end transform
end clip
fill glyph 16 solid 30 136 229 255
end transform
start transform 1 0 0 1 0 0
start clip glyph 21
start transform 1 0 0 1 0 0
solid 145 103 77 255
end transform
end clip
fill glyph 21 solid 145 103 77 255
end transform
start transform 1 0 0 1 0 0
start clip glyph 16
@@ -63,11 +51,7 @@ start transform 1 0 0.2 1 0 0
end clip
end transform
start transform 1 0 0 1 0 0
start clip glyph 18
start transform 1 0 0 1 0 0
solid 66 66 66 51
end transform
end clip
fill glyph 18 solid 66 66 66 51
end transform
start transform 1 0 0 1 0 0
start clip glyph 19
@@ -86,11 +70,7 @@ start transform 1 0 0.2 1 0 0
end clip
end transform
start transform 1 0 0 1 0 0
start clip glyph 20
start transform 1 0 0 1 0 0
solid 145 103 77 255
end transform
end clip
fill glyph 20 solid 145 103 77 255
end transform
end clip
end transform
+4 -12
View File
@@ -1,14 +1,6 @@
start transform 1 0 0.3 1 0 0
start clip glyph 8
solid 81 61 50 255
end clip
start clip glyph 9
solid 245 185 68 255
end clip
start clip glyph 10
solid 224 142 55 255
end clip
start clip glyph 11
solid 245 202 86 255
end clip
fill glyph 8 solid 81 61 50 255
fill glyph 9 solid 245 185 68 255
fill glyph 10 solid 224 142 55 255
fill glyph 11 solid 245 202 86 255
end transform
+4 -12
View File
@@ -1,14 +1,6 @@
start transform 1 0 0.3 1 0 0
start clip glyph 12
solid 81 61 50 255
end clip
start clip glyph 13
solid 245 185 68 255
end clip
start clip glyph 14
solid 224 142 55 255
end clip
start clip glyph 15
solid 245 202 86 255
end clip
fill glyph 12 solid 81 61 50 255
fill glyph 13 solid 245 185 68 255
fill glyph 14 solid 224 142 55 255
fill glyph 15 solid 245 202 86 255
end transform
+4 -12
View File
@@ -1,12 +1,4 @@
start clip glyph 16
solid 81 61 50 255
end clip
start clip glyph 17
solid 245 185 68 255
end clip
start clip glyph 18
solid 224 142 55 255
end clip
start clip glyph 19
solid 245 202 86 255
end clip
fill glyph 16 solid 81 61 50 255
fill glyph 17 solid 245 185 68 255
fill glyph 18 solid 224 142 55 255
fill glyph 19 solid 245 202 86 255
+2 -10
View File
@@ -1,20 +1,12 @@
start transform 1 0 0 1 0 0
push group
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 0 0 255 128
end transform
end clip
fill glyph 3 solid 0 0 255 128
end transform
push group
start transform 1 0.268 0 1 0 -134
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 255 165 0 179
end transform
end clip
fill glyph 3 solid 255 165 0 179
end transform
end transform
pop group mode 4
+2 -10
View File
@@ -1,20 +1,12 @@
start transform 1 0 0 1 0 0
push group
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 0 0 255 128
end transform
end clip
fill glyph 3 solid 0 0 255 128
end transform
push group
start transform 1 0 0 1 100 0
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 255 165 0 179
end transform
end clip
fill glyph 3 solid 255 165 0 179
end transform
end transform
pop group mode 4
+3 -15
View File
@@ -1,30 +1,18 @@
start transform 1 0 0 1 0 0
start clip rectangle 0 0 1e+03 1e+03
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 0 0 0 255
end transform
end clip
fill glyph 3 solid 0 0 0 255
end transform
push group
start transform 0.5 0 0 0.5 166 334
start transform 1 0 0 1 0 0
start clip glyph 2
start transform 1 0 0 1 0 0
solid 255 220 1 255
end transform
end clip
fill glyph 2 solid 255 220 1 255
end transform
end transform
push group
start transform 0.5 0 0 0.5 334 166
start transform 1 0 0 1 0 0
start clip glyph 2
start transform 1 0 0 1 0 0
solid 104 199 232 255
end transform
end clip
fill glyph 2 solid 104 199 232 255
end transform
end transform
pop group mode 3
+1 -5
View File
@@ -1,11 +1,7 @@
start transform 1 0 0 1 0 0
start clip rectangle 100 250 900 950
start transform 1 0 0 1 0 0
start clip glyph 154
start transform 1 0 0 1 0 0
solid 0 0 0 255
end transform
end clip
fill glyph 154 solid 0 0 0 255
end transform
end clip
end transform
+1 -3
View File
@@ -1,3 +1 @@
start clip glyph 165
solid 0 0 0 255
end clip
fill glyph 165 solid 0 0 0 255
+1 -3
View File
@@ -1,3 +1 @@
start clip glyph 175
solid 0 0 0 255
end clip
fill glyph 175 solid 0 0 0 255
+1 -3
View File
@@ -1,3 +1 @@
start clip glyph 6
solid 0 0 0 255
end clip
fill glyph 6 solid 0 0 0 255
+2 -10
View File
@@ -1,20 +1,12 @@
start transform 1 0 0 1 0 0
push group
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 0 0 255 128
end transform
end clip
fill glyph 3 solid 0 0 255 128
end transform
push group
start transform 1 0.268 0 1 0 -134
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 255 165 0 179
end transform
end clip
fill glyph 3 solid 255 165 0 179
end transform
end transform
pop group mode 4
+2 -10
View File
@@ -1,20 +1,12 @@
start transform 1 0 0 1 0 0
push group
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 0 0 255 128
end transform
end clip
fill glyph 3 solid 0 0 255 128
end transform
push group
start transform 1 0 0 1 100 0
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 255 165 0 179
end transform
end clip
fill glyph 3 solid 255 165 0 179
end transform
end transform
pop group mode 4
+3 -15
View File
@@ -1,30 +1,18 @@
start transform 1 0 0 1 0 0
start clip rectangle 0 0 1e+03 1e+03
start transform 1 0 0 1 0 0
start clip glyph 3
start transform 1 0 0 1 0 0
solid 0 0 0 255
end transform
end clip
fill glyph 3 solid 0 0 0 255
end transform
push group
start transform 0.5 0 0 0.5 166 334
start transform 1 0 0 1 0 0
start clip glyph 2
start transform 1 0 0 1 0 0
solid 255 220 1 255
end transform
end clip
fill glyph 2 solid 255 220 1 255
end transform
end transform
push group
start transform 0.5 0 0 0.5 334 166
start transform 1 0 0 1 0 0
start clip glyph 2
start transform 1 0 0 1 0 0
solid 104 199 232 255
end transform
end clip
fill glyph 2 solid 104 199 232 255
end transform
end transform
pop group mode 3
+1 -5
View File
@@ -1,11 +1,7 @@
start transform 1 0 0 1 0 0
start clip rectangle 100 250 900 950
start transform 1 0 0 1 0 0
start clip glyph 154
start transform 1 0 0 1 0 0
solid 0 0 0 255
end transform
end clip
fill glyph 154 solid 0 0 0 255
end transform
end clip
end transform
+1 -3
View File
@@ -1,3 +1 @@
start clip glyph 165
solid 0 0 0 255
end clip
fill glyph 165 solid 0 0 0 255
+1 -3
View File
@@ -1,3 +1 @@
start clip glyph 175
solid 0 0 0 255
end clip
fill glyph 175 solid 0 0 0 255
+1 -3
View File
@@ -1,3 +1 @@
start clip glyph 6
solid 0 0 0 255
end clip
fill glyph 6 solid 0 0 0 255
+48
View File
@@ -111,6 +111,24 @@ pop_transform (hb_paint_funcs_t *funcs HB_UNUSED,
print (data, "end transform");
}
static void
fill_glyph (hb_paint_funcs_t *funcs HB_UNUSED,
void *paint_data,
hb_codepoint_t glyph,
hb_font_t *font HB_UNUSED,
hb_bool_t use_foreground HB_UNUSED,
hb_color_t color,
void *user_data HB_UNUSED)
{
paint_data_t *data = paint_data;
print (data, "fill glyph %u solid %d %d %d %d", glyph,
hb_color_get_red (color),
hb_color_get_green (color),
hb_color_get_blue (color),
hb_color_get_alpha (color));
}
static hb_bool_t
paint_color_glyph (hb_paint_funcs_t *funcs HB_UNUSED,
void *paint_data,
@@ -341,6 +359,7 @@ get_test_paint_funcs (void)
hb_paint_funcs_set_push_transform_func (funcs, push_transform, NULL, NULL);
hb_paint_funcs_set_pop_transform_func (funcs, pop_transform, NULL, NULL);
hb_paint_funcs_set_fill_glyph_func (funcs, fill_glyph, NULL, NULL);
hb_paint_funcs_set_color_glyph_func (funcs, paint_color_glyph, NULL, NULL);
hb_paint_funcs_set_push_clip_glyph_func (funcs, push_clip_glyph, NULL, NULL);
hb_paint_funcs_set_push_clip_rectangle_func (funcs, push_clip_rectangle, NULL, NULL);
@@ -828,6 +847,34 @@ test_push_clip_path_round_trip (void)
hb_draw_funcs_destroy (sink);
}
/* Test the default implementation of fill_glyph does the
* push_clip_glyph + color + pop_clip sequence. */
static void
test_fill_glyph_nil_decomposes (void)
{
hb_paint_funcs_t *funcs = hb_paint_funcs_create ();
hb_paint_funcs_set_push_clip_glyph_func (funcs, push_clip_glyph, NULL, NULL);
hb_paint_funcs_set_color_func (funcs, paint_color, NULL, NULL);
hb_paint_funcs_set_pop_clip_func (funcs, pop_clip, NULL, NULL);
hb_paint_funcs_make_immutable (funcs);
paint_data_t data;
data.string = g_string_new ("");
data.level = 0;
hb_paint_fill_glyph (funcs, &data, 42, hb_font_get_empty (),
FALSE, HB_COLOR (1, 2, 3, 4));
g_assert_true (data.level == 0);
g_assert_cmpstr (data.string->str, ==,
"start clip glyph 42\n"
" solid 3 2 1 4\n"
"end clip\n");
g_string_free (data.string, TRUE);
hb_paint_funcs_destroy (funcs);
}
int
main (int argc, char **argv)
@@ -840,6 +887,7 @@ main (int argc, char **argv)
* below doesn't prevent them from running. */
hb_test_add (test_push_clip_path_nil_returns_null);
hb_test_add (test_push_clip_path_round_trip);
hb_test_add (test_fill_glyph_nil_decomposes);
for (unsigned int i = 0; i < G_N_ELEMENTS (paint_tests); i++)
{
@@ -0,0 +1,159 @@
%PDF-1.4
%ÀÁÂÃ
1 0 obj
<< /Type /Catalog /Pages 2 0 R >>
endobj
2 0 obj
<< /Type /Pages /Kids [3 0 R] /Count 1 >>
endobj
3 0 obj
<< /Type /Page /Parent 2 0 R /MediaBox [-16 -8208 65552 57360]
/Contents 4 0 R >>
endobj
4 0 obj
<< /Length 4518 >>
stream
1 1 1 rg
-16 -8208 65568 65568 re f
q
1 0 0 1 0 0 cm
0.8667 0.1804 0.2667 rg
55936 47744 m
62336 41344 65536 33621.33 65536 24576 c
65536 15530.67 62336 7808 55936 1408 c
49536 -4992 41813.33 -8192 32768 -8192 c
23722.67 -8192 16000 -4992 9600 1408 c
3200 7808 0 15530.67 0 24576 c
0 33621.33 3200 41344 9600 47744 c
16000 54144 23722.67 57344 32768 57344 c
41813.33 57344 49536 54144 55936 47744 c
h
f
1 1 1 rg
25472 35200 m
26410.67 35200 26880 34645.33 26880 33536 c
26880 32426.67 26410.67 31872 25472 31872 c
20992 31872 l
22101.33 29312 23637.33 27050.67 25600 25088 c
25941.33 24746.67 26112 24320 26112 23808 c
26112 23381.33 25984 22997.33 25728 22656 c
25386.67 22314.67 25002.67 22144 24576 22144 c
24064 22144 23594.67 22357.33 23168 22784 c
22144 24234.67 21162.67 26112 20224 28416 c
20650.67 25344 20864 22869.33 20864 20992 c
20864 3456 l
20864 2517.33 20266.67 2048 19072 2048 c
17962.67 2048 17408 2517.33 17408 3456 c
17408 19712 l
17408 21504 17664 24064 18176 27392 c
16554.67 22101.33 14592 17877.33 12288 14720 c
11861.33 14208 11349.33 13952 10752 13952 c
10410.67 13952 10112 14037.33 9856 14208 c
9344 14634.67 9088 15104 9088 15616 c
9088 16042.67 9216 16469.33 9472 16896 c
12800 20992 15232 25984 16768 31872 c
11520 31872 l
10581.33 31872 10112 32426.67 10112 33536 c
10112 34645.33 10581.33 35200 11520 35200 c
17408 35200 l
17408 41600 l
15786.67 41258.67 14250.67 41002.67 12800 40832 c
12800 40746.67 12714.67 40704 12544 40704 c
11605.33 40704 11050.67 41216 10880 42240 c
10880 42496 l
10880 43434.67 11306.67 43989.33 12160 44160 c
16853.33 44842.67 20693.33 45952 23680 47488 c
24021.33 47658.67 24405.33 47744 24832 47744 c
25429.33 47744 25941.33 47445.33 26368 46848 c
26624 46506.67 26752 46165.33 26752 45824 c
26752 45226.67 26410.67 44757.33 25728 44416 c
24533.33 43818.67 22912 43178.67 20864 42496 c
20864 35200 l
25472 35200 l
h
33792 36224 m
33792 37162.67 34432 37632 35712 37632 c
36906.67 37632 37504 37120 37504 36096 c
37504 19328 l
42197.33 25642.67 45738.67 33706.67 48128 43520 c
48298.67 44458.67 48853.33 44928 49792 44928 c
49962.67 44928 50133.33 44885.33 50304 44800 c
51413.33 44629.33 51968 44074.67 51968 43136 c
51968 42880 51925.33 42709.33 51840 42624 c
48597.33 30677.33 43818.67 21120 37504 13952 c
37504 9088 l
37504 7978.67 38016 7338.67 39040 7168 c
39893.33 7082.67 41045.33 7040 42496 7040 c
43776 7040 44906.67 7168 45888 7424 c
46869.33 7680 47488 8234.67 47744 9088 c
48085.33 10282.67 48298.67 11946.67 48384 14080 c
48384 15104 48981.33 15616 50176 15616 c
50304 15616 l
51413.33 15530.67 51968 14933.33 51968 13824 c
51968 13696 l
51797.33 10794.67 51456 8533.33 50944 6912 c
50346.67 5290.67 49066.67 4266.67 47104 3840 c
45994.67 3669.33 44458.67 3541.33 42496 3456 c
40618.67 3456 38997.33 3541.33 37632 3712 c
35072 4053.33 33792 5418.67 33792 7808 c
33792 11264 l
31317.33 8960 28672 6954.67 25856 5248 c
25429.33 4992 25002.67 4864 24576 4864 c
23893.33 4864 23424 5162.67 23168 5760 c
22912 6016 22784 6357.33 22784 6784 c
22784 7552 23125.33 8106.67 23808 8448 c
27306.67 10410.67 30634.67 13013.33 33792 16256 c
33792 36224 l
h
29696 30592 m
29781.33 30592 29866.67 30592 29952 30592 c
30976 30421.33 31488 29866.67 31488 28928 c
31488 28672 31488 28501.33 31488 28416 c
30976 23466.67 29952 19200 28416 15616 c
27989.33 14848 27392 14464 26624 14464 c
26368 14464 26112 14506.67 25856 14592 c
25258.67 14933.33 24960 15402.67 24960 16000 c
24960 16341.33 25045.33 16682.67 25216 17024 c
26666.67 20352 27648 24405.33 28160 29184 c
28245.33 30122.67 28757.33 30592 29696 30592 c
h
42624 41984 m
43221.33 41472 43520 40917.33 43520 40320 c
43520 39978.67 43434.67 39680 43264 39424 c
42837.33 38826.67 42282.67 38528 41600 38528 c
41088 38528 40661.33 38698.67 40320 39040 c
37845.33 41002.67 35157.33 42709.33 32256 44160 c
31658.67 44501.33 31360 44970.67 31360 45568 c
31360 45909.33 31445.33 46208 31616 46464 c
32042.67 47146.67 32640 47488 33408 47488 c
33664 47488 34005.33 47402.67 34432 47232 c
37674.67 45696 40405.33 43946.67 42624 41984 c
h
50816 29952 m
51498.67 29952 52053.33 29568 52480 28800 c
53930.67 25642.67 55082.67 22058.67 55936 18048 c
56021.33 17706.67 56064 17450.67 56064 17280 c
56064 16512 55637.33 15957.33 54784 15616 c
54442.67 15616 54229.33 15616 54144 15616 c
53290.67 15616 52736 16085.33 52480 17024 c
51456 21205.33 50346.67 24661.33 49152 27392 c
48981.33 27648 48896 27946.67 48896 28288 c
48896 28970.67 49237.33 29482.67 49920 29824 c
50176 29909.33 50474.67 29952 50816 29952 c
h
f
Q
endstream
endobj
xref
0 5
0000000000 65535 f
0000000015 00000 n
0000000064 00000 n
0000000121 00000 n
0000000218 00000 n
trailer
<< /Size 5 /Root 1 0 R >>
startxref
4787
%%EOF
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-16 -57360 65568 65568" width="65568" height="65568">
<rect x="-16" y="-57360" width="65568" height="65568" fill="rgb(255,255,255)"/>
<g transform="scale(1,-1)">
<path d="M55936,47744Q65536,38144 65536,24576Q65536,11008 55936,1408Q46336,-8192 32768,-8192Q19200,-8192 9600,1408Q0,11008 0,24576Q0,38144 9600,47744Q19200,57344 32768,57344Q46336,57344 55936,47744Z" fill="#DD2E44"/>
<path d="M25472,35200Q26880,35200 26880,33536Q26880,31872 25472,31872L20992,31872Q22656,28032 25600,25088Q26112,24576 26112,23808Q26112,23168 25728,22656Q25216,22144 24576,22144Q23808,22144 23168,22784Q21632,24960 20224,28416Q20864,23808 20864,20992L20864,3456Q20864,2048 19072,2048Q17408,2048 17408,3456L17408,19712Q17408,22400 18176,27392Q15744,19456 12288,14720Q11648,13952 10752,13952Q10240,13952 9856,14208Q9088,14848 9088,15616Q9088,16256 9472,16896Q14464,23040 16768,31872L11520,31872Q10112,31872 10112,33536Q10112,35200 11520,35200L17408,35200L17408,41600Q14976,41088 12800,40832Q12800,40704 12544,40704Q11136,40704 10880,42240L10880,42496Q10880,43904 12160,44160Q19200,45184 23680,47488Q24192,47744 24832,47744Q25728,47744 26368,46848Q26752,46336 26752,45824Q26752,44928 25728,44416Q23936,43520 20864,42496L20864,35200L25472,35200ZM33792,36224Q33792,37632 35712,37632Q37504,37632 37504,36096L37504,19328Q44544,28800 48128,43520Q48384,44928 49792,44928Q50048,44928 50304,44800Q51968,44544 51968,43136Q51968,42752 51840,42624Q46976,24704 37504,13952L37504,9088Q37504,7424 39040,7168Q40320,7040 42496,7040Q44416,7040 45888,7424Q47360,7808 47744,9088Q48256,10880 48384,14080Q48384,15616 50176,15616L50304,15616Q51968,15488 51968,13824L51968,13696Q51712,9344 50944,6912Q50048,4480 47104,3840Q45440,3584 42496,3456Q39680,3456 37632,3712Q33792,4224 33792,7808L33792,11264Q30080,7808 25856,5248Q25216,4864 24576,4864Q23552,4864 23168,5760Q22784,6144 22784,6784Q22784,7936 23808,8448Q29056,11392 33792,16256L33792,36224ZM29696,30592Q29824,30592 29952,30592Q31488,30336 31488,28928Q31488,28544 31488,28416Q30720,20992 28416,15616Q27776,14464 26624,14464Q26240,14464 25856,14592Q24960,15104 24960,16000Q24960,16512 25216,17024Q27392,22016 28160,29184Q28288,30592 29696,30592ZM42624,41984Q43520,41216 43520,40320Q43520,39808 43264,39424Q42624,38528 41600,38528Q40832,38528 40320,39040Q36608,41984 32256,44160Q31360,44672 31360,45568Q31360,46080 31616,46464Q32256,47488 33408,47488Q33792,47488 34432,47232Q39296,44928 42624,41984ZM50816,29952Q51840,29952 52480,28800Q54656,24064 55936,18048Q56064,17536 56064,17280Q56064,16128 54784,15616Q54272,15616 54144,15616Q52864,15616 52480,17024Q50944,23296 49152,27392Q48896,27776 48896,28288Q48896,29312 49920,29824Q50304,29952 50816,29952Z" fill="#FFF"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

@@ -7,30 +7,18 @@
<stop offset="0" stop-color="rgb(255,202,40)"/>
<stop offset="1" stop-color="rgb(255,179,0)"/>
</radialGradient>
<path id="p1" d="M860,-135C800,-134 709,-100 646,-73C599,-52 547,-50 499,-67L451,-84C405,-100 354,-85 325,-47L231,79L1019,81C1019,81 1004,-138 860,-135Z"/>
<path id="p1" d="M259,-90L98,-209C86,-218 72,-209 75,-195L120,-10C121,-6 123,-1 125,2L659,892C670,911 693,918 711,908L793,862C810,852 815,829 804,810L270,-77C268,-82 264,-87 259,-90Z"/>
<clipPath id="clip-p1"><use href="#p1"/></clipPath>
<path id="p2" d="M418,268L559,501L558,462C557,422 583,386 622,374L418,268Z"/>
<clipPath id="clip-p2"><use href="#p2"/></clipPath>
<path id="p3" d="M259,-90L98,-209C86,-218 72,-209 75,-195L120,-10C121,-6 123,-1 125,2L659,892C670,911 693,918 711,908L793,862C810,852 815,829 804,810L270,-77C268,-82 264,-87 259,-90Z"/>
<clipPath id="clip-p3"><use href="#p3"/></clipPath>
<path id="p4" d="M503,542C535,542 585,525 608,513C622,506 942,337 1023,299C1037,293 1054,290 1075,290C1092,290 1108,291 1122,293C1131,294 1140,295 1146,295L1147,295C1161,294 1172,284 1172,270L1172,-52C1172,-61 1163,-68 1155,-68C1153,-68 1151,-67 1150,-67C1122,-59 1069,-53 1039,-53C1034,-53 1030,-53 1026,-54C999,-55 972,-64 943,-74L937,-76C933,-77 930,-79 927,-82C908,-99 887,-107 863,-107L860,-107C817,-106 741,-84 657,-47C628,-34 597,-28 565,-28C539,-28 514,-32 489,-41L441,-58C432,-61 423,-62 413,-62C387,-62 363,-50 348,-30L335,-13C330,-6 321,-2 313,-2C312,-2 311,-2 310,-2C307,-2 304,-2 302,-2C274,-2 264,11 259,22C252,36 251,51 257,66C259,72 259,78 257,84C263,85 269,88 274,92C280,99 288,105 296,109C297,109 297,110 297,110L425,186C432,190 436,197 438,204L458,305C459,314 457,323 451,330C446,336 438,339 430,339C429,339 428,339 428,339L347,331L346,331C310,326 281,299 273,265L230,129C229,129 229,128 229,128C229,126 228,124 227,122C225,116 225,109 227,104C221,103 215,100 211,96C199,85 183,78 168,78C165,78 163,78 160,79C145,81 130,91 122,103C116,113 114,125 117,138C121,147 137,191 150,256C155,279 159,301 163,323C169,355 176,394 181,403C181,404 181,404 181,404C192,420 207,431 225,435C226,435 228,436 229,436L492,541C494,542 498,542 503,542ZM503,570C496,570 489,569 484,568L218,462C193,456 172,440 158,420C148,409 138,332 123,262C108,192 91,146 91,146C76,93 118,57 156,51C160,50 164,50 168,50C189,50 212,58 230,76C223,55 223,32 234,10C248,-19 274,-30 302,-30C305,-30 309,-30 313,-30L326,-47C346,-75 380,-90 414,-90C426,-90 439,-88 451,-84L499,-67C521,-59 543,-56 566,-56C593,-56 620,-61 646,-73C709,-100 800,-134 860,-135L863,-135C897,-135 925,-122 946,-102C975,-93 1003,-83 1028,-82C1031,-82 1035,-81 1039,-81C1070,-81 1119,-87 1142,-94C1146,-95 1151,-96 1155,-96C1179,-96 1200,-76 1200,-52L1200,270C1200,299 1177,322 1148,323C1148,323 1147,323 1146,323C1130,323 1102,318 1076,318C1061,318 1046,319 1035,325C954,363 621,538 621,538C596,551 541,570 503,570ZM254,112C255,115 255,118 256,121L300,257C305,281 325,300 350,303L430,311L410,210L283,134C272,128 262,120 254,112Z"/>
<clipPath id="clip-p4"><use href="#p4"/></clipPath>
<path id="p5" d="M259,-90L98,-209C86,-218 72,-209 75,-195L120,-10C121,-6 123,-1 125,2L659,892C670,911 693,918 711,908L793,862C810,852 815,829 804,810L270,-77C268,-82 264,-87 259,-90Z"/>
<clipPath id="clip-p5"><use href="#p5"/></clipPath>
<linearGradient id="gr1" gradientUnits="userSpaceOnUse" x1="10.45" y1="12.12" x2="2.81" y2="-1.65" spreadMethod="pad">
<stop offset="0" stop-color="rgb(100,181,246)"/>
<stop offset="1" stop-color="rgb(33,150,243)"/>
</linearGradient>
<path id="p6" d="M694,884C695,884 696,884 697,884L779,837C779,837 781,836 781,834C782,833 782,829 779,824L246,-63C245,-65 244,-66 242,-68L112,-164L147,-16C147,-15 148,-13 149,-12L683,877C686,882 691,884 694,884ZM694,913C681,913 667,905 659,892L125,2C122,-1 121,-5 120,-10L75,-195C73,-205 80,-212 89,-212C92,-212 95,-211 98,-209L259,-90C264,-87 268,-82 271,-77L804,810C815,829 810,852 793,862L711,908C706,911 700,913 694,913Z"/>
<clipPath id="clip-p6"><use href="#p6"/></clipPath>
<path id="p7" d="M775,346C659,390 569,383 503,332C458,296 294,179 222,102C187,65 219,24 249,5C308,-32 366,-29 494,48C559,88 600,55 647,23C647,23 719,-36 783,-59C846,-81 995,-47 1045,29C1100,112 1011,256 775,346Z"/>
<clipPath id="clip-p7"><use href="#p7"/></clipPath>
<path id="p2" d="M775,346C659,390 569,383 503,332C458,296 294,179 222,102C187,65 219,24 249,5C308,-32 366,-29 494,48C559,88 600,55 647,23C647,23 719,-36 783,-59C846,-81 995,-47 1045,29C1100,112 1011,256 775,346Z"/>
<clipPath id="clip-p2"><use href="#p2"/></clipPath>
<radialGradient id="gr2" gradientUnits="userSpaceOnUse" cx="9.91" cy="2.5" r="4.1" fx="9.91" fy="2.5" fr="1.89" spreadMethod="pad">
<stop offset="0" stop-color="rgb(255,202,40)"/>
<stop offset="1" stop-color="rgb(255,179,0)"/>
</radialGradient>
<path id="p8" d="M635,347C590,347 553,335 521,310C511,302 495,290 476,275C409,225 297,141 242,83C235,75 234,69 235,65C236,54 248,39 264,29C284,16 303,11 323,11C360,11 408,30 479,73C504,88 527,95 551,95C593,95 625,73 656,51L662,47C663,46 664,46 665,45C665,45 734,-12 792,-32C795,-34 801,-35 808,-36C832,-51 857,-59 886,-60C846,-68 808,-68 783,-59C719,-36 647,24 647,24C644,25 642,27 640,28C596,58 556,86 494,49C366,-29 308,-32 249,5C219,24 187,65 222,102C294,179 458,296 503,332C518,343 535,353 552,360C577,370 605,375 635,375C657,375 681,372 707,366C717,364 728,361 739,358C707,355 684,350 667,345C656,346 645,347 635,347Z"/>
<clipPath id="clip-p8"><use href="#p8"/></clipPath>
</defs>
<rect x="-16" y="-966" width="1307" height="1232" fill="rgb(255,255,255)"/>
<g transform="scale(1,-1)">
@@ -46,49 +34,29 @@
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M860,-135C800,-134 709,-100 646,-73C599,-52 547,-50 499,-67L451,-84C405,-100 354,-85 325,-47L231,79L1019,81C1019,81 1004,-138 860,-135Z" fill="#FA0"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M418,268L559,501L558,462C557,422 583,386 622,374L418,268Z" fill="#EDA600"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M259,-90L98,-209C86,-218 72,-209 75,-195L120,-10C121,-6 123,-1 125,2L659,892C670,911 693,918 711,908L793,862C810,852 815,829 804,810L270,-77C268,-82 264,-87 259,-90Z" fill="#1E88E5"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M503,542C535,542 585,525 608,513C622,506 942,337 1023,299C1037,293 1054,290 1075,290C1092,290 1108,291 1122,293C1131,294 1140,295 1146,295L1147,295C1161,294 1172,284 1172,270L1172,-52C1172,-61 1163,-68 1155,-68C1153,-68 1151,-67 1150,-67C1122,-59 1069,-53 1039,-53C1034,-53 1030,-53 1026,-54C999,-55 972,-64 943,-74L937,-76C933,-77 930,-79 927,-82C908,-99 887,-107 863,-107L860,-107C817,-106 741,-84 657,-47C628,-34 597,-28 565,-28C539,-28 514,-32 489,-41L441,-58C432,-61 423,-62 413,-62C387,-62 363,-50 348,-30L335,-13C330,-6 321,-2 313,-2C312,-2 311,-2 310,-2C307,-2 304,-2 302,-2C274,-2 264,11 259,22C252,36 251,51 257,66C259,72 259,78 257,84C263,85 269,88 274,92C280,99 288,105 296,109C297,109 297,110 297,110L425,186C432,190 436,197 438,204L458,305C459,314 457,323 451,330C446,336 438,339 430,339C429,339 428,339 428,339L347,331L346,331C310,326 281,299 273,265L230,129C229,129 229,128 229,128C229,126 228,124 227,122C225,116 225,109 227,104C221,103 215,100 211,96C199,85 183,78 168,78C165,78 163,78 160,79C145,81 130,91 122,103C116,113 114,125 117,138C121,147 137,191 150,256C155,279 159,301 163,323C169,355 176,394 181,403C181,404 181,404 181,404C192,420 207,431 225,435C226,435 228,436 229,436L492,541C494,542 498,542 503,542ZM503,570C496,570 489,569 484,568L218,462C193,456 172,440 158,420C148,409 138,332 123,262C108,192 91,146 91,146C76,93 118,57 156,51C160,50 164,50 168,50C189,50 212,58 230,76C223,55 223,32 234,10C248,-19 274,-30 302,-30C305,-30 309,-30 313,-30L326,-47C346,-75 380,-90 414,-90C426,-90 439,-88 451,-84L499,-67C521,-59 543,-56 566,-56C593,-56 620,-61 646,-73C709,-100 800,-134 860,-135L863,-135C897,-135 925,-122 946,-102C975,-93 1003,-83 1028,-82C1031,-82 1035,-81 1039,-81C1070,-81 1119,-87 1142,-94C1146,-95 1151,-96 1155,-96C1179,-96 1200,-76 1200,-52L1200,270C1200,299 1177,322 1148,323C1148,323 1147,323 1146,323C1130,323 1102,318 1076,318C1061,318 1046,319 1035,325C954,363 621,538 621,538C596,551 541,570 503,570ZM254,112C255,115 255,118 256,121L300,257C305,281 325,300 350,303L430,311L410,210L283,134C272,128 262,120 254,112Z" fill="#EDA600"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p1)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#FA0"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p2)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#EDA600"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p3)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#1E88E5"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p4)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#EDA600"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p5)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="url(#gr1)"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p6)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#424242" fill-opacity="0.2"/>
</g>
</g>
<path d="M694,884C695,884 696,884 697,884L779,837C779,837 781,836 781,834C782,833 782,829 779,824L246,-63C245,-65 244,-66 242,-68L112,-164L147,-16C147,-15 148,-13 149,-12L683,877C686,882 691,884 694,884ZM694,913C681,913 667,905 659,892L125,2C122,-1 121,-5 120,-10L75,-195C73,-205 80,-212 89,-212C92,-212 95,-211 98,-209L259,-90C264,-87 268,-82 271,-77L804,810C815,829 810,852 793,862L711,908C706,911 700,913 694,913Z" fill="#424242" fill-opacity="0.2"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p7)">
<g clip-path="url(#clip-p2)">
<g transform="matrix(64,0,0,64,0,0)">
<g transform="matrix(1,0,0,0.9691162,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="url(#gr2)"/>
@@ -97,11 +65,7 @@
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p8)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#EDA600"/>
</g>
</g>
<path d="M635,347C590,347 553,335 521,310C511,302 495,290 476,275C409,225 297,141 242,83C235,75 234,69 235,65C236,54 248,39 264,29C284,16 303,11 323,11C360,11 408,30 479,73C504,88 527,95 551,95C593,95 625,73 656,51L662,47C663,46 664,46 665,45C665,45 734,-12 792,-32C795,-34 801,-35 808,-36C832,-51 857,-59 886,-60C846,-68 808,-68 783,-59C719,-36 647,24 647,24C644,25 642,27 640,28C596,58 556,86 494,49C366,-29 308,-32 249,5C219,24 187,65 222,102C294,179 458,296 503,332C518,343 535,353 552,360C577,370 605,375 635,375C657,375 681,372 707,366C717,364 728,361 739,358C707,355 684,350 667,345C656,346 645,347 635,347Z" fill="#EDA600"/>
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

@@ -7,30 +7,18 @@
<stop offset="0" stop-color="rgb(255,202,40)"/>
<stop offset="1" stop-color="rgb(255,179,0)"/>
</radialGradient>
<path id="p1" d="M860,-135Q903,-136 932,-114.5Q961,-93 978.5,-60.5Q996,-28 1004.5,4.5Q1013,37 1016,59Q1019,81 1019,81L231,79L325,-47Q347,-76 381.5,-86Q416,-96 451,-84L499,-67Q573,-41 646,-73Q677,-86 715.5,-100.5Q754,-115 792,-125Q830,-135 860,-135Z"/>
<path id="p1" d="M259,-90Q266,-85 270,-77L804,810Q812,824 809,839.5Q806,855 793,862L711,908Q698,916 682.5,911Q667,906 659,892L125,2Q121,-3 120,-10L75,-195Q73,-205 81,-210.5Q89,-216 98,-209L259,-90Z"/>
<clipPath id="clip-p1"><use href="#p1"/></clipPath>
<path id="p2" d="M418,268L622,374Q593,383 575,407.5Q557,432 558,462L559,501L418,268Z"/>
<clipPath id="clip-p2"><use href="#p2"/></clipPath>
<path id="p3" d="M259,-90Q266,-85 270,-77L804,810Q812,824 809,839.5Q806,855 793,862L711,908Q698,916 682.5,911Q667,906 659,892L125,2Q121,-3 120,-10L75,-195Q73,-205 81,-210.5Q89,-216 98,-209L259,-90Z"/>
<clipPath id="clip-p3"><use href="#p3"/></clipPath>
<path id="p4" d="M503,542Q499,542 496.5,541.5Q494,541 492,541L229,436Q227,436 225,435Q197,428 181,404Q181,404 181,404Q181,404 181,403Q177,396 172.5,371.5Q168,347 163,323Q160,307 157,290Q154,273 150,256Q140,208 130,176Q120,144 117,138Q112,118 122,103Q135,83 160,79Q164,78 168,78Q192,78 211,96Q217,102 227,104Q224,113 227,122Q229,126 229,128Q229,128 229,128.5Q229,129 230,129L273,265Q279,291 299,309Q319,327 346,331Q346,331 346.5,331Q347,331 347,331L428,339Q428,339 430,339Q443,339 451,330Q460,319 458,305L438,204Q436,192 425,186L297,110Q297,109 296,109Q284,102 274,92Q267,85 257,84Q260,75 257,66Q249,44 259,22Q263,14 272,6Q281,-2 302,-2Q306,-2 310,-2Q311,-2 313,-2Q327,-2 335,-13L348,-30Q372,-62 413,-62Q428,-62 441,-58L489,-41Q526,-28 565,-28Q613,-28 657,-47Q720,-74 774,-90Q828,-106 860,-107L863,-107Q899,-107 927,-82Q931,-78 937,-76L943,-74Q964,-67 985,-61Q1006,-55 1026,-54Q1031,-53 1039,-53Q1062,-53 1095.5,-57Q1129,-61 1150,-67Q1152,-68 1155,-68Q1161,-68 1166.5,-63.5Q1172,-59 1172,-52L1172,270Q1172,280 1164.5,287Q1157,294 1147,295L1146,295Q1142,295 1135.5,294.5Q1129,294 1122,293Q1112,292 1100,291Q1088,290 1075,290Q1043,290 1023,299Q1002,309 965,327.5Q928,346 882.5,369.5Q837,393 790,417.5Q743,442 703,463Q663,484 637,497.5Q611,511 608,513Q591,522 559,532Q527,542 503,542L503,542ZM503,570Q532,570 567.5,559Q603,548 621,538Q621,538 645.5,525Q670,512 710,491Q750,470 797.5,445.5Q845,421 892,397Q939,373 977,353.5Q1015,334 1035,325Q1043,321 1053.5,319.5Q1064,318 1076,318Q1095,318 1114.5,320.5Q1134,323 1146,323Q1146,323 1147,323Q1148,323 1148,323Q1170,322 1185,307Q1200,292 1200,270L1200,-52Q1200,-70 1186.5,-83Q1173,-96 1155,-96Q1148,-96 1142,-94Q1125,-89 1093.5,-85Q1062,-81 1039,-81Q1033,-81 1028,-82Q1009,-83 988.5,-89Q968,-95 946,-102Q930,-117 909.5,-126Q889,-135 863,-135L860,-135Q830,-134 792,-124.5Q754,-115 715.5,-100.5Q677,-86 646,-73Q608,-56 566,-56Q531,-56 499,-67L451,-84Q433,-90 414,-90Q388,-90 364.5,-79Q341,-68 326,-47L313,-30Q307,-30 302,-30Q281,-30 263,-21Q245,-12 234,10Q218,42 230,76Q217,63 200.5,56.5Q184,50 168,50Q162,50 156,51Q137,54 119,66.5Q101,79 92,99Q83,119 91,146Q91,146 101.5,178Q112,210 123,262Q130,297 136.5,331Q143,365 148,389.5Q153,414 158,420Q180,453 218,462L484,568Q492,570 503,570ZM254,112Q266,125 283,134L410,210L430,311L350,303Q331,300 317.5,287.5Q304,275 300,257L256,121Q255,116 254,112Z"/>
<clipPath id="clip-p4"><use href="#p4"/></clipPath>
<path id="p5" d="M259,-90Q266,-85 270,-77L804,810Q812,824 809,839.5Q806,855 793,862L711,908Q698,916 682.5,911Q667,906 659,892L125,2Q121,-3 120,-10L75,-195Q73,-205 81,-210.5Q89,-216 98,-209L259,-90Z"/>
<clipPath id="clip-p5"><use href="#p5"/></clipPath>
<linearGradient id="gr1" gradientUnits="userSpaceOnUse" x1="10.45" y1="12.12" x2="2.81" y2="-1.65" spreadMethod="pad">
<stop offset="0" stop-color="rgb(100,181,246)"/>
<stop offset="1" stop-color="rgb(33,150,243)"/>
</linearGradient>
<path id="p6" d="M694,884Q687,884 683,877L149,-12Q148,-14 147,-16L112,-164L242,-68Q244,-66 246,-63L779,824Q782,828 782,830.5Q782,833 781,834Q781,837 779,837L697,884Q696,884 694,884L694,884ZM694,913Q703,913 711,908L793,862Q806,855 809,839.5Q812,824 804,810L271,-77Q266,-85 259,-90L98,-209Q94,-212 89,-212Q82,-212 78,-207Q74,-202 75,-195L120,-10Q121,-3 125,2L659,892Q671,913 694,913Z"/>
<clipPath id="clip-p6"><use href="#p6"/></clipPath>
<path id="p7" d="M775,346Q893,301 962,243Q1031,185 1051.5,127.5Q1072,70 1045,29Q1026,0 992,-20Q958,-40 918.5,-51.5Q879,-63 842.5,-65Q806,-67 783,-59Q751,-48 719.5,-28Q688,-8 667.5,7.5Q647,23 647,23Q623,39 600.5,52.5Q578,66 552,67Q526,68 494,48Q430,10 386.5,-5.5Q343,-21 310.5,-17Q278,-13 249,5Q234,14 221.5,30Q209,46 206.5,64.5Q204,83 222,102Q249,131 289.5,165Q330,199 372.5,232Q415,265 450.5,291.5Q486,318 503,332Q552,370 620,374.5Q688,379 775,346Z"/>
<clipPath id="clip-p7"><use href="#p7"/></clipPath>
<path id="p2" d="M775,346Q893,301 962,243Q1031,185 1051.5,127.5Q1072,70 1045,29Q1026,0 992,-20Q958,-40 918.5,-51.5Q879,-63 842.5,-65Q806,-67 783,-59Q751,-48 719.5,-28Q688,-8 667.5,7.5Q647,23 647,23Q623,39 600.5,52.5Q578,66 552,67Q526,68 494,48Q430,10 386.5,-5.5Q343,-21 310.5,-17Q278,-13 249,5Q234,14 221.5,30Q209,46 206.5,64.5Q204,83 222,102Q249,131 289.5,165Q330,199 372.5,232Q415,265 450.5,291.5Q486,318 503,332Q552,370 620,374.5Q688,379 775,346Z"/>
<clipPath id="clip-p2"><use href="#p2"/></clipPath>
<radialGradient id="gr2" gradientUnits="userSpaceOnUse" cx="9.91" cy="2.5" r="4.1" fx="9.91" fy="2.5" fr="1.89" spreadMethod="pad">
<stop offset="0" stop-color="rgb(255,202,40)"/>
<stop offset="1" stop-color="rgb(255,179,0)"/>
</radialGradient>
<path id="p8" d="M635,347Q650,347 667,345Q680,349 697.5,352.5Q715,356 739,358Q722,363 707,366Q669,375 635,375Q590,375 552,360Q526,349 503,332Q486,318 450.5,291.5Q415,265 372.5,232Q330,199 289.5,165Q249,131 222,102Q204,84 206.5,65Q209,46 221.5,30.5Q234,15 249,5Q278,-13 310.5,-17Q343,-21 386.5,-5.5Q430,10 494,49Q525,67 550,67Q575,67 596.5,55Q618,43 640,28Q643,26 647,24Q647,24 667.5,8Q688,-8 719.5,-28Q751,-48 783,-59Q801,-65 828.5,-65.5Q856,-66 886,-60L886,-60Q864,-59 845,-53Q826,-47 808,-36Q799,-35 792,-32Q763,-22 733.5,-3.5Q704,15 684.5,30Q665,45 665,45Q664,45 662,47L656,51Q633,67 607.5,81Q582,95 551,95Q515,95 479,73Q426,40 388.5,25.5Q351,11 323,11Q293,11 264,29Q237,46 235,65Q234,68 235,72.5Q236,77 242,83Q269,112 311.5,147Q354,182 398,216Q442,250 476,275Q490,286 501.5,295Q513,304 521,310Q568,347 635,347Z"/>
<clipPath id="clip-p8"><use href="#p8"/></clipPath>
</defs>
<rect x="-16" y="-966" width="1307" height="1232" fill="rgb(255,255,255)"/>
<g transform="scale(1,-1)">
@@ -46,49 +34,29 @@
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M860,-135Q903,-136 932,-114.5Q961,-93 978.5,-60.5Q996,-28 1004.5,4.5Q1013,37 1016,59Q1019,81 1019,81L231,79L325,-47Q347,-76 381.5,-86Q416,-96 451,-84L499,-67Q573,-41 646,-73Q677,-86 715.5,-100.5Q754,-115 792,-125Q830,-135 860,-135Z" fill="#FA0"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M418,268L622,374Q593,383 575,407.5Q557,432 558,462L559,501L418,268Z" fill="#EDA600"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M259,-90Q266,-85 270,-77L804,810Q812,824 809,839.5Q806,855 793,862L711,908Q698,916 682.5,911Q667,906 659,892L125,2Q121,-3 120,-10L75,-195Q73,-205 81,-210.5Q89,-216 98,-209L259,-90Z" fill="#1E88E5"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<path d="M503,542Q499,542 496.5,541.5Q494,541 492,541L229,436Q227,436 225,435Q197,428 181,404Q181,404 181,404Q181,404 181,403Q177,396 172.5,371.5Q168,347 163,323Q160,307 157,290Q154,273 150,256Q140,208 130,176Q120,144 117,138Q112,118 122,103Q135,83 160,79Q164,78 168,78Q192,78 211,96Q217,102 227,104Q224,113 227,122Q229,126 229,128Q229,128 229,128.5Q229,129 230,129L273,265Q279,291 299,309Q319,327 346,331Q346,331 346.5,331Q347,331 347,331L428,339Q428,339 430,339Q443,339 451,330Q460,319 458,305L438,204Q436,192 425,186L297,110Q297,109 296,109Q284,102 274,92Q267,85 257,84Q260,75 257,66Q249,44 259,22Q263,14 272,6Q281,-2 302,-2Q306,-2 310,-2Q311,-2 313,-2Q327,-2 335,-13L348,-30Q372,-62 413,-62Q428,-62 441,-58L489,-41Q526,-28 565,-28Q613,-28 657,-47Q720,-74 774,-90Q828,-106 860,-107L863,-107Q899,-107 927,-82Q931,-78 937,-76L943,-74Q964,-67 985,-61Q1006,-55 1026,-54Q1031,-53 1039,-53Q1062,-53 1095.5,-57Q1129,-61 1150,-67Q1152,-68 1155,-68Q1161,-68 1166.5,-63.5Q1172,-59 1172,-52L1172,270Q1172,280 1164.5,287Q1157,294 1147,295L1146,295Q1142,295 1135.5,294.5Q1129,294 1122,293Q1112,292 1100,291Q1088,290 1075,290Q1043,290 1023,299Q1002,309 965,327.5Q928,346 882.5,369.5Q837,393 790,417.5Q743,442 703,463Q663,484 637,497.5Q611,511 608,513Q591,522 559,532Q527,542 503,542L503,542ZM503,570Q532,570 567.5,559Q603,548 621,538Q621,538 645.5,525Q670,512 710,491Q750,470 797.5,445.5Q845,421 892,397Q939,373 977,353.5Q1015,334 1035,325Q1043,321 1053.5,319.5Q1064,318 1076,318Q1095,318 1114.5,320.5Q1134,323 1146,323Q1146,323 1147,323Q1148,323 1148,323Q1170,322 1185,307Q1200,292 1200,270L1200,-52Q1200,-70 1186.5,-83Q1173,-96 1155,-96Q1148,-96 1142,-94Q1125,-89 1093.5,-85Q1062,-81 1039,-81Q1033,-81 1028,-82Q1009,-83 988.5,-89Q968,-95 946,-102Q930,-117 909.5,-126Q889,-135 863,-135L860,-135Q830,-134 792,-124.5Q754,-115 715.5,-100.5Q677,-86 646,-73Q608,-56 566,-56Q531,-56 499,-67L451,-84Q433,-90 414,-90Q388,-90 364.5,-79Q341,-68 326,-47L313,-30Q307,-30 302,-30Q281,-30 263,-21Q245,-12 234,10Q218,42 230,76Q217,63 200.5,56.5Q184,50 168,50Q162,50 156,51Q137,54 119,66.5Q101,79 92,99Q83,119 91,146Q91,146 101.5,178Q112,210 123,262Q130,297 136.5,331Q143,365 148,389.5Q153,414 158,420Q180,453 218,462L484,568Q492,570 503,570ZM254,112Q266,125 283,134L410,210L430,311L350,303Q331,300 317.5,287.5Q304,275 300,257L256,121Q255,116 254,112Z" fill="#EDA600"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p1)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#FA0"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p2)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#EDA600"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p3)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#1E88E5"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p4)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#EDA600"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p5)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="url(#gr1)"/>
</g>
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p6)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#424242" fill-opacity="0.2"/>
</g>
</g>
<path d="M694,884Q687,884 683,877L149,-12Q148,-14 147,-16L112,-164L242,-68Q244,-66 246,-63L779,824Q782,828 782,830.5Q782,833 781,834Q781,837 779,837L697,884Q696,884 694,884L694,884ZM694,913Q703,913 711,908L793,862Q806,855 809,839.5Q812,824 804,810L271,-77Q266,-85 259,-90L98,-209Q94,-212 89,-212Q82,-212 78,-207Q74,-202 75,-195L120,-10Q121,-3 125,2L659,892Q671,913 694,913Z" fill="#424242" fill-opacity="0.2"/>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p7)">
<g clip-path="url(#clip-p2)">
<g transform="matrix(64,0,0,64,0,0)">
<g transform="matrix(1,0,0,0.9691162,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="url(#gr2)"/>
@@ -97,11 +65,7 @@
</g>
</g>
<g transform="matrix(0.015625,0,0,0.015625,0,0)">
<g clip-path="url(#clip-p8)">
<g transform="matrix(64,0,0,64,0,0)">
<rect x="-32767" y="-32767" width="65534" height="65534" fill="#EDA600"/>
</g>
</g>
<path d="M635,347Q650,347 667,345Q680,349 697.5,352.5Q715,356 739,358Q722,363 707,366Q669,375 635,375Q590,375 552,360Q526,349 503,332Q486,318 450.5,291.5Q415,265 372.5,232Q330,199 289.5,165Q249,131 222,102Q204,84 206.5,65Q209,46 221.5,30.5Q234,15 249,5Q278,-13 310.5,-17Q343,-21 386.5,-5.5Q430,10 494,49Q525,67 550,67Q575,67 596.5,55Q618,43 640,28Q643,26 647,24Q647,24 667.5,8Q688,-8 719.5,-28Q751,-48 783,-59Q801,-65 828.5,-65.5Q856,-66 886,-60L886,-60Q864,-59 845,-53Q826,-47 808,-36Q799,-35 792,-32Q763,-22 733.5,-3.5Q704,15 684.5,30Q665,45 665,45Q664,45 662,47L656,51Q633,67 607.5,81Q582,95 551,95Q515,95 479,73Q426,40 388.5,25.5Q351,11 323,11Q293,11 264,29Q237,46 235,65Q234,68 235,72.5Q236,77 242,83Q269,112 311.5,147Q354,182 398,216Q442,250 476,275Q490,286 501.5,295Q513,304 521,310Q568,347 635,347Z" fill="#EDA600"/>
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

+2
View File
@@ -14,3 +14,5 @@
../../../fuzzing/fonts/noto_handwriting-cff_colr_1.otf;;U+270D;../expected/basic/handwriting-cff-colr-1.svg
../../../fuzzing/fonts/noto_handwriting-cff2_colr_1.otf;;U+270D;../expected/basic/handwriting-cff-colr-1.svg
../../../api/fonts/Roboto-Regular.abc.ttf;--font-size=65536;U+0061,U+0062,U+0063;../expected/basic/glyf-quadratics.pdf
../../../api/fonts/TwemojiMozilla.subset.default.32,3299.ttf;--font-size=65536;U+3299;../expected/basic/colrv0-large-scale.svg
../../../api/fonts/TwemojiMozilla.subset.default.32,3299.ttf;--font-size=65536;U+3299;../expected/basic/colrv0-large-scale.pdf