diff --git a/experiments/svg_cairo.nim b/experiments/svg_cairo.nim index 6b7f765..086f802 100644 --- a/experiments/svg_cairo.nim +++ b/experiments/svg_cairo.nim @@ -245,8 +245,7 @@ proc decodeCtxInternal(inherited: Ctx, node: XmlNode): Ctx = if strokeOpacity.len == 0: strokeOpacity = parts[1].strip() else: - when defined(pixieDebugSvg): - maybeLogPair(parts[0], parts[1]) + discard elif pair.len > 0: when defined(pixieDebugSvg): echo "Invalid style pair: ", pair diff --git a/src/pixie/fileformats/svg.nim b/src/pixie/fileformats/svg.nim index 671535c..3982508 100644 --- a/src/pixie/fileformats/svg.nim +++ b/src/pixie/fileformats/svg.nim @@ -79,6 +79,23 @@ proc decodeCtxInternal(inherited: Ctx, node: XmlNode): Ctx = fillOpacity = node.attr("fill-opacity") strokeOpacity = node.attr("stroke-opacity") + when defined(pixieDebugSvg): + proc maybeLogPair(k, v: string) = + if k notin [ + "fill-rule", "fill", "stroke", "stroke-width", "stroke-linecap", + "stroke-linejoin", "stroke-miterlimit", "stroke-dasharray", + "transform", "style", "version", "viewBox", "width", "height", + "xmlns", "x", "y", "x1", "x2", "y1", "y2", "id", "d", "cx", "cy", + "r", "points", "rx", "ry", "enable-background", "xml:space", + "xmlns:xlink", "data-name", "role", "class", "opacity", + "fill-opacity", "stroke-opacity" + ]: + echo k, ": ", v + + if node.attrs() != nil: + for k, v in node.attrs(): + maybeLogPair(k, v) + let pairs = style.split(';') for pair in pairs: let parts = pair.split(':')