Add support for the transform-origin attribute.

crates/resvg/Cargo.toml

@@ -21,7 +21,7 @@ log = "0.4"
 pico-args = { version = "0.5", features = ["eq-separator"] }
 png = { version = "0.17", optional = true }
 rgb = "0.8"
-svgtypes = "0.12"
+svgtypes = { git = "https://github.com/LaurenzV/svgtypes" }
 tiny-skia = "0.11.2"
 usvg = { path = "../usvg", version = "0.36.0", default-features = false }
 

crates/usvg-parser/Cargo.toml

@@ -22,5 +22,5 @@ log = "0.4"
 roxmltree = "0.18"
 simplecss = "0.2"
 siphasher = "0.3" # perfect hash implementation
-svgtypes = "0.12"
+svgtypes = { git = "https://github.com/LaurenzV/svgtypes" }
 usvg-tree = { path = "../usvg-tree", version = "0.36.0" }

crates/usvg-parser/src/clippath.rs

@@ -8,6 +8,7 @@ use std::str::FromStr;
 use usvg_tree::{ClipPath, Group, Node, NodeKind, Transform, Units};
 
 use crate::converter;
+use crate::converter::{resolve_transform_origin, State};
 use crate::svgtree::{AId, EId, SvgNode};
 
 pub(crate) fn convert(
@@ -21,7 +22,7 @@ pub(crate) fn convert(
     }
 
     // The whole clip path should be ignored when a transform is invalid.
-    let transform = resolve_transform(node)?;
+    let transform = resolve_clip_path_transform(node, state)?;
 
     // Check if this element was already converted.
     if let Some(clip) = cache.clip_paths.get(node.element_id()) {
@@ -67,7 +68,7 @@ pub(crate) fn convert(
     }
 }
 
-fn resolve_transform(node: SvgNode) -> Option<Transform> {
+fn resolve_clip_path_transform(node: SvgNode, state: &State) -> Option<Transform> {
     // Do not use Node::attribute::<Transform>, because it will always
     // return a valid transform.
 
@@ -94,7 +95,7 @@ fn resolve_transform(node: SvgNode) -> Option<Transform> {
     );
 
     if ts.is_valid() {
-        Some(ts)
+        Some(resolve_transform_origin(node, state, ts))
     } else {
         None
     }

crates/usvg-parser/src/converter.rs

@@ -7,11 +7,12 @@ use std::hash::{Hash, Hasher};
 use std::rc::Rc;
 use std::str::FromStr;
 
-use svgtypes::{Length, LengthUnit as Unit};
+use svgtypes::{Length, LengthUnit as Unit, TransformOrigin};
 use usvg_tree::*;
 
 use crate::svgtree::{self, AId, EId, FromValue, SvgNode};
 use crate::units;
+use crate::units::convert_length;
 use crate::{Error, Options};
 
 #[derive(Clone)]
@@ -560,7 +561,11 @@ pub(crate) fn convert_group(
         filters
     };
 
-    let transform: Transform = node.attribute(AId::Transform).unwrap_or_default();
+    let transform: Transform = resolve_transform_origin(
+        node,
+        state,
+        node.attribute(AId::Transform).unwrap_or_default(),
+    );
     let blend_mode: BlendMode = node.attribute(AId::MixBlendMode).unwrap_or_default();
     let isolation: Isolation = node.attribute(AId::Isolation).unwrap_or_default();
     let isolate = isolation == Isolation::Isolate;
@@ -602,6 +607,41 @@ pub(crate) fn convert_group(
     }
 }
 
+pub(crate) fn resolve_transform_origin(
+    node: SvgNode,
+    state: &State,
+    mut transform: Transform,
+) -> Transform {
+    let transform_origin: Option<TransformOrigin> = node.attribute(AId::TransformOrigin);
+
+    if let Some(transform_origin) = transform_origin {
+        let transform_origin = Transform::from_translate(
+            convert_length(
+                transform_origin.x_offset,
+                node,
+                AId::Width,
+                Units::UserSpaceOnUse,
+                state,
+            ),
+            convert_length(
+                transform_origin.y_offset,
+                node,
+                AId::Height,
+                Units::UserSpaceOnUse,
+                state,
+            ),
+        );
+        transform = transform_origin
+            .pre_concat(transform)
+            .pre_concat(Transform::from_translate(
+                -transform_origin.tx,
+                -transform_origin.ty,
+            ));
+    }
+
+    transform
+}
+
 fn remove_empty_groups(tree: &mut Tree) {
     fn rm(parent: Node) -> bool {
         let mut changed = false;

crates/usvg-parser/src/style.rs

@@ -187,6 +187,8 @@ fn convert_paint(
                 from_fallback(node, fallback, opacity)
             }
         }
+        // Ignore `context-fill` and `context-stroke for now
+        _ => None,
     }
 }
 

crates/usvg-parser/src/svgtree/mod.rs

@@ -709,6 +709,7 @@ impl AId {
                 | AId::TextOverflow
                 | AId::TextRendering
                 | AId::Transform
+                | AId::TransformOrigin
                 | AId::UnicodeBidi
                 | AId::VectorEffect
                 | AId::Visibility
@@ -801,6 +802,7 @@ fn is_non_inheritable(id: AId) -> bool {
             | AId::StopOpacity
             | AId::TextDecoration
             | AId::Transform
+            | AId::TransformOrigin
     )
 }
 
@@ -871,6 +873,12 @@ impl<'a, 'input: 'a> FromValue<'a, 'input> for usvg_tree::Transform {
     }
 }
 
+impl<'a, 'input: 'a> FromValue<'a, 'input> for svgtypes::TransformOrigin {
+    fn parse(_: SvgNode, _: AId, value: &str) -> Option<Self> {
+        Self::from_str(value).ok()
+    }
+}
+
 impl<'a, 'input: 'a> FromValue<'a, 'input> for svgtypes::ViewBox {
     fn parse(_: SvgNode, _: AId, value: &str) -> Option<Self> {
         Self::from_str(value).ok()