The marker attribute will be replaced with marker-start, `marker-…

…mid`, and `marker-end` attributes for compatibility reasons.

Closes #112

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http:https://semver.org/).
 ## [Unreleased]
 ### Added
 - `--list-separator`.
+- The `marker` attribute will be replaced with `marker-start`, `marker-mid`, and `marker-end` attributes
+ for compatibility reasons.
 
 ### Changed
 - Attributes with `inherit` or `currentColor` and without a proper parent is an error now.

src/task/fix_attrs.rs

@@ -35,6 +35,8 @@ pub fn fix_invalid_attributes(doc: &Document) {
  _ => {}
  }
  }
+
+ fix_marker(doc);
 }
 
 /// Fix `rect` element attributes.
@@ -306,3 +308,61 @@ fn rm_negative_len(node: &mut Node, id: AId) {
  }
  }
 }
+
+/// The `marker` attribute is not well supported, so we have to replace it
+/// with `marker-start`, `marker-mid` and `marker-end`.
+fn fix_marker(doc: &Document) {
+ let marker_attrs = &[
+ AId::MarkerStart,
+ AId::MarkerMid,
+ AId::MarkerEnd,
+ ];
+
+ for mut node in doc.descendants() {
+ if node.has_attribute(AId::Marker) {
+ let v = node.attributes().get_value(AId::Marker).unwrap().clone();
+
+ for aid in marker_attrs {
+ node.set_attribute_if_none(*aid, &v);
+ }
+
+ node.remove_attribute(AId::Marker);
+ }
+ }
+}
+
+#[cfg(test)]
+mod test_marker_attrs {
+ use super::*;
+ use svgdom::{Document, ToStringWithOptions};
+
+ macro_rules! test {
+ ($name:ident, $in_text:expr, $out_text:expr) => (
+ base_test!($name, fix_invalid_attributes, $in_text, $out_text);
+ )
+ }
+
+ test!(fix_marker_1,
+"<svg>
+ <marker id='m1'/>
+ <path marker='url(#m1)'/>
+</svg>",
+"<svg>
+ <marker id='m1'/>
+ <path marker-end='url(#m1)' marker-mid='url(#m1)' marker-start='url(#m1)'/>
+</svg>
+");
+
+ test!(fix_marker_2,
+"<svg>
+ <marker id='m1'/>
+ <marker id='m2'/>
+ <path marker='url(#m1)' marker-start='url(#m2)'/>
+</svg>",
+"<svg>
+ <marker id='m1'/>
+ <marker id='m2'/>
+ <path marker-end='url(#m1)' marker-mid='url(#m1)' marker-start='url(#m2)'/>
+</svg>
+");
+}