From f6b60d9d644e5f8aeeb5043b4014a208a8affb88 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 25 Feb 2026 23:37:22 -0300 Subject: [PATCH] raster/svg: split base helpers into hb-raster-svg-* units --- src/hb-raster-svg-base.cc | 127 ++++++++++++++++++++++++ src/hb-raster-svg-base.hh | 142 ++++++++++++++++++++++++++ src/hb-raster-svg.cc | 203 +------------------------------------- src/meson.build | 2 + 4 files changed, 273 insertions(+), 201 deletions(-) create mode 100644 src/hb-raster-svg-base.cc create mode 100644 src/hb-raster-svg-base.hh diff --git a/src/hb-raster-svg-base.cc b/src/hb-raster-svg-base.cc new file mode 100644 index 000000000..1d25047f8 --- /dev/null +++ b/src/hb-raster-svg-base.cc @@ -0,0 +1,127 @@ +/* + * Copyright © 2026 Behdad Esfahbod + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Author(s): Behdad Esfahbod + */ + +#include "hb.hh" + +#include "hb-raster-svg-base.hh" + +static inline char +svg_ascii_lower (char c) +{ + if (c >= 'A' && c <= 'Z') + return c + ('a' - 'A'); + return c; +} + +bool +svg_str_eq_ascii_ci (hb_svg_str_t s, const char *lit) +{ + unsigned n = (unsigned) strlen (lit); + if (s.len != n) return false; + for (unsigned i = 0; i < n; i++) + if (svg_ascii_lower (s.data[i]) != svg_ascii_lower (lit[i])) + return false; + return true; +} + +bool +svg_str_starts_with_ascii_ci (hb_svg_str_t s, const char *lit) +{ + unsigned n = (unsigned) strlen (lit); + if (s.len < n) return false; + for (unsigned i = 0; i < n; i++) + if (svg_ascii_lower (s.data[i]) != svg_ascii_lower (lit[i])) + return false; + return true; +} + +void +svg_parse_style_props (hb_svg_str_t style, hb_svg_style_props_t *out) +{ + if (style.is_null ()) return; + const char *p = style.data; + const char *end = style.data + style.len; + while (p < end) + { + while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || *p == ';')) + p++; + if (p >= end) break; + const char *name_start = p; + while (p < end && *p != ':' && *p != ';') + p++; + const char *name_end = p; + while (name_end > name_start && + (name_end[-1] == ' ' || name_end[-1] == '\t' || name_end[-1] == '\n' || name_end[-1] == '\r')) + name_end--; + if (p >= end || *p != ':') + { + while (p < end && *p != ';') p++; + continue; + } + p++; /* skip ':' */ + const char *value_start = p; + while (p < end && *p != ';') + p++; + const char *value_end = p; + while (value_start < value_end && + (*value_start == ' ' || *value_start == '\t' || *value_start == '\n' || *value_start == '\r')) + value_start++; + while (value_end > value_start && + (value_end[-1] == ' ' || value_end[-1] == '\t' || value_end[-1] == '\n' || value_end[-1] == '\r')) + value_end--; + + hb_svg_str_t prop_name = {name_start, (unsigned) (name_end - name_start)}; + hb_svg_str_t prop_value = {value_start, (unsigned) (value_end - value_start)}; + if (svg_str_eq_ascii_ci (prop_name, "fill")) out->fill = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "fill-opacity")) out->fill_opacity = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "opacity")) out->opacity = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "transform")) out->transform = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "clip-path")) out->clip_path = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "display")) out->display = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "color")) out->color = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "visibility")) out->visibility = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "offset")) out->offset = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "stop-color")) out->stop_color = prop_value; + else if (svg_str_eq_ascii_ci (prop_name, "stop-opacity")) out->stop_opacity = prop_value; + + if (p < end && *p == ';') p++; + } +} + +float +svg_parse_number_or_percent (hb_svg_str_t s, bool *is_percent) +{ + if (is_percent) *is_percent = false; + s = s.trim (); + if (!s.len) return 0.f; + if (s.data[s.len - 1] == '%') + { + if (is_percent) *is_percent = true; + hb_svg_str_t n = {s.data, s.len - 1}; + return n.to_float () / 100.f; + } + return s.to_float (); +} diff --git a/src/hb-raster-svg-base.hh b/src/hb-raster-svg-base.hh new file mode 100644 index 000000000..2ec04b468 --- /dev/null +++ b/src/hb-raster-svg-base.hh @@ -0,0 +1,142 @@ +/* + * Copyright © 2026 Behdad Esfahbod + * + * This is part of HarfBuzz, a text shaping library. + * + * Permission is hereby granted, without written agreement and without + * license or royalty fees, to use, copy, modify, and distribute this + * software and its documentation for any purpose, provided that the + * above copyright notice and the following two paragraphs appear in + * all copies of this software. + * + * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN + * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO + * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * Author(s): Behdad Esfahbod + */ + +#ifndef HB_RASTER_SVG_BASE_HH +#define HB_RASTER_SVG_BASE_HH + +#include "hb.hh" + +#include +#include + +struct hb_svg_str_t +{ + const char *data; + unsigned len; + + hb_svg_str_t () : data (nullptr), len (0) {} + hb_svg_str_t (const char *d, unsigned l) : data (d), len (l) {} + + bool is_null () const { return !data; } + + bool eq (const char *s) const + { + unsigned slen = (unsigned) strlen (s); + return len == slen && memcmp (data, s, len) == 0; + } + + bool starts_with (const char *prefix) const + { + unsigned plen = (unsigned) strlen (prefix); + return len >= plen && memcmp (data, prefix, plen) == 0; + } + + bool eq_cstr (const char *s) const + { + unsigned slen = (unsigned) strlen (s); + return len == slen && memcmp (data, s, len) == 0; + } + + float to_float () const + { + if (!data || !len) return 0.f; + char buf[64]; + unsigned n = hb_min (len, (unsigned) sizeof (buf) - 1); + memcpy (buf, data, n); + buf[n] = '\0'; + return strtof (buf, nullptr); + } + + int to_int () const + { + if (!data || !len) return 0; + char buf[32]; + unsigned n = hb_min (len, (unsigned) sizeof (buf) - 1); + memcpy (buf, data, n); + buf[n] = '\0'; + return atoi (buf); + } + + hb_svg_str_t trim_left () const + { + const char *p = data; + unsigned l = len; + while (l && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) + { + p++; + l--; + } + return {p, l}; + } + + hb_svg_str_t trim () const + { + hb_svg_str_t s = trim_left (); + while (s.len && (s.data[s.len - 1] == ' ' || s.data[s.len - 1] == '\t' || + s.data[s.len - 1] == '\n' || s.data[s.len - 1] == '\r')) + s.len--; + return s; + } +}; + +struct hb_svg_style_props_t +{ + hb_svg_str_t fill; + hb_svg_str_t fill_opacity; + hb_svg_str_t opacity; + hb_svg_str_t transform; + hb_svg_str_t clip_path; + hb_svg_str_t display; + hb_svg_str_t color; + hb_svg_str_t visibility; + hb_svg_str_t offset; + hb_svg_str_t stop_color; + hb_svg_str_t stop_opacity; +}; + +HB_INTERNAL bool svg_str_eq_ascii_ci (hb_svg_str_t s, const char *lit); +HB_INTERNAL bool svg_str_starts_with_ascii_ci (hb_svg_str_t s, const char *lit); +HB_INTERNAL void svg_parse_style_props (hb_svg_str_t style, hb_svg_style_props_t *out); +HB_INTERNAL float svg_parse_number_or_percent (hb_svg_str_t s, bool *is_percent); +static inline float +svg_parse_float_clamped01 (hb_svg_str_t s) +{ + return hb_clamp (s.to_float (), 0.f, 1.f); +} + +static inline bool +svg_str_is_inherit (hb_svg_str_t s) +{ + return svg_str_eq_ascii_ci (s.trim (), "inherit"); +} + +static inline bool +svg_str_is_none (hb_svg_str_t s) +{ + return svg_str_eq_ascii_ci (s.trim (), "none"); +} + +#endif /* HB_RASTER_SVG_BASE_HH */ diff --git a/src/hb-raster-svg.cc b/src/hb-raster-svg.cc index d38440780..625980493 100644 --- a/src/hb-raster-svg.cc +++ b/src/hb-raster-svg.cc @@ -30,6 +30,7 @@ #include "hb-raster.h" #include "hb-raster-paint.hh" #include "hb-raster-svg.hh" +#include "hb-raster-svg-base.hh" #include "OT/Color/svg/svg.hh" #include "hb-draw.h" #include "hb-ot-color.h" @@ -41,209 +42,9 @@ /* - * 1. String view helper + * 1. String / style helpers live in hb-raster-svg-base.* */ -struct hb_svg_str_t -{ - const char *data; - unsigned len; - - hb_svg_str_t () : data (nullptr), len (0) {} - hb_svg_str_t (const char *d, unsigned l) : data (d), len (l) {} - - bool is_null () const { return !data; } - - bool eq (const char *s) const - { - unsigned slen = strlen (s); - return len == slen && memcmp (data, s, len) == 0; - } - - bool starts_with (const char *prefix) const - { - unsigned plen = strlen (prefix); - return len >= plen && memcmp (data, prefix, plen) == 0; - } - - bool eq_cstr (const char *s) const - { - unsigned slen = strlen (s); - return len == slen && memcmp (data, s, len) == 0; - } - - float to_float () const - { - if (!data || !len) return 0.f; - /* strtof needs null-terminated string; we use a small stack buffer */ - char buf[64]; - unsigned n = hb_min (len, (unsigned) sizeof (buf) - 1); - memcpy (buf, data, n); - buf[n] = '\0'; - return strtof (buf, nullptr); - } - - int to_int () const - { - if (!data || !len) return 0; - char buf[32]; - unsigned n = hb_min (len, (unsigned) sizeof (buf) - 1); - memcpy (buf, data, n); - buf[n] = '\0'; - return atoi (buf); - } - - /* Skip leading whitespace */ - hb_svg_str_t trim_left () const - { - const char *p = data; - unsigned l = len; - while (l && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) - { p++; l--; } - return {p, l}; - } - - hb_svg_str_t trim () const - { - hb_svg_str_t s = trim_left (); - while (s.len && (s.data[s.len - 1] == ' ' || s.data[s.len - 1] == '\t' || - s.data[s.len - 1] == '\n' || s.data[s.len - 1] == '\r')) - s.len--; - return s; - } -}; - -static inline char -svg_ascii_lower (char c) -{ - if (c >= 'A' && c <= 'Z') - return c + ('a' - 'A'); - return c; -} - -static bool -svg_str_eq_ascii_ci (hb_svg_str_t s, const char *lit) -{ - unsigned n = (unsigned) strlen (lit); - if (s.len != n) return false; - for (unsigned i = 0; i < n; i++) - if (svg_ascii_lower (s.data[i]) != svg_ascii_lower (lit[i])) - return false; - return true; -} - -static bool -svg_str_starts_with_ascii_ci (hb_svg_str_t s, const char *lit) -{ - unsigned n = (unsigned) strlen (lit); - if (s.len < n) return false; - for (unsigned i = 0; i < n; i++) - if (svg_ascii_lower (s.data[i]) != svg_ascii_lower (lit[i])) - return false; - return true; -} - -struct hb_svg_style_props_t -{ - hb_svg_str_t fill; - hb_svg_str_t fill_opacity; - hb_svg_str_t opacity; - hb_svg_str_t transform; - hb_svg_str_t clip_path; - hb_svg_str_t display; - hb_svg_str_t color; - hb_svg_str_t visibility; - hb_svg_str_t offset; - hb_svg_str_t stop_color; - hb_svg_str_t stop_opacity; -}; - -static void -svg_parse_style_props (hb_svg_str_t style, hb_svg_style_props_t *out) -{ - if (style.is_null ()) return; - const char *p = style.data; - const char *end = style.data + style.len; - while (p < end) - { - while (p < end && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || *p == ';')) - p++; - if (p >= end) break; - const char *name_start = p; - while (p < end && *p != ':' && *p != ';') - p++; - const char *name_end = p; - while (name_end > name_start && - (name_end[-1] == ' ' || name_end[-1] == '\t' || name_end[-1] == '\n' || name_end[-1] == '\r')) - name_end--; - if (p >= end || *p != ':') - { - while (p < end && *p != ';') p++; - continue; - } - p++; /* skip ':' */ - const char *value_start = p; - while (p < end && *p != ';') - p++; - const char *value_end = p; - while (value_start < value_end && - (*value_start == ' ' || *value_start == '\t' || *value_start == '\n' || *value_start == '\r')) - value_start++; - while (value_end > value_start && - (value_end[-1] == ' ' || value_end[-1] == '\t' || value_end[-1] == '\n' || value_end[-1] == '\r')) - value_end--; - - hb_svg_str_t prop_name = {name_start, (unsigned) (name_end - name_start)}; - hb_svg_str_t prop_value = {value_start, (unsigned) (value_end - value_start)}; - if (svg_str_eq_ascii_ci (prop_name, "fill")) out->fill = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "fill-opacity")) out->fill_opacity = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "opacity")) out->opacity = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "transform")) out->transform = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "clip-path")) out->clip_path = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "display")) out->display = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "color")) out->color = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "visibility")) out->visibility = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "offset")) out->offset = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "stop-color")) out->stop_color = prop_value; - else if (svg_str_eq_ascii_ci (prop_name, "stop-opacity")) out->stop_opacity = prop_value; - - if (p < end && *p == ';') p++; - } -} - -static float -svg_parse_float_clamped01 (hb_svg_str_t s) -{ - return hb_clamp (s.to_float (), 0.f, 1.f); -} - -static float -svg_parse_number_or_percent (hb_svg_str_t s, bool *is_percent) -{ - if (is_percent) *is_percent = false; - s = s.trim (); - if (!s.len) return 0.f; - if (s.data[s.len - 1] == '%') - { - if (is_percent) *is_percent = true; - hb_svg_str_t n = {s.data, s.len - 1}; - return n.to_float () / 100.f; - } - return s.to_float (); -} - -static bool -svg_str_is_inherit (hb_svg_str_t s) -{ - return svg_str_eq_ascii_ci (s.trim (), "inherit"); -} - -static bool -svg_str_is_none (hb_svg_str_t s) -{ - return svg_str_eq_ascii_ci (s.trim (), "none"); -} - /* * 2. Minimal XML tokenizer diff --git a/src/meson.build b/src/meson.build index c9a2f6f6b..238f1cc95 100644 --- a/src/meson.build +++ b/src/meson.build @@ -705,6 +705,8 @@ hb_raster_sources = [ 'hb-raster-image.hh', 'hb-raster-utils.hh', 'hb-raster-draw.cc', + 'hb-raster-svg-base.cc', + 'hb-raster-svg-base.hh', 'hb-raster-paint.cc', 'hb-raster-paint.hh', 'hb-raster-svg.cc',