fix: drop unwanted, custom attributes that Subplot uses

Sponsored-by: author

2 files changed, 14 insertions, 3 deletions

diff --git a/src/html.rs b/src/html.rs
index 3232724..23579f9 100644
--- a/src/html.rs
+++ b/src/html.rs
@@ -281,6 +281,13 @@ impl Element {
         self.attrs.push(attr);
     }
 
+    /// Drop all attributes with a given name.
+    pub fn drop_attributes(&mut self, unwanted: &[&str]) {
+        for uw in unwanted {
+            self.attrs.retain(|a| a.name() != *uw);
+        }
+    }
+
     /// Append a new child to the element.
     pub fn push_child(&mut self, child: Content) {
         self.children.push(child);
@@ -508,7 +515,7 @@ impl Attributes {
         if let Some(new_value) = attr.value() {
             if let Some(old_value) = self.attrs.get_mut(attr.name()) {
                 assert!(!old_value.is_empty());
-                old_value.push(',');
+                old_value.push(' ');
                 old_value.push_str(new_value);
             } else {
                 self.attrs.insert(attr.name().into(), new_value.into());
diff --git a/src/md.rs b/src/md.rs
index 554cc00..042bade 100644
--- a/src/md.rs
+++ b/src/md.rs
@@ -324,6 +324,7 @@ fn extract_scenario(e: &[StructureElement]) -> Result<(Option<Scenario>, usize),
 }
 
 mod typeset {
+    const UNWANTED_ATTRS: &[&str] = &["add-newline"];
 
     use crate::html::{Attribute, Content, Element, ElementTag};
     // use crate::parser::parse_scenario_snippet;
@@ -338,7 +339,7 @@ mod typeset {
     use base64::prelude::{Engine as _, BASE64_STANDARD};
 
     pub(crate) fn typeset_element(e: &Element) -> Result<Element, SubplotError> {
-        match e.tag() {
+        let new = match e.tag() {
             ElementTag::Pre if e.has_attr("class", "scenario") => typeset_scenario(e),
             ElementTag::Pre if e.has_attr("class", "file") => typeset_file(e),
             ElementTag::Pre if e.has_attr("class", "example") => typeset_example(e),
@@ -360,7 +361,10 @@ mod typeset {
                 }
                 Ok(new)
             }
-        }
+        };
+        let mut new = new?;
+        new.drop_attributes(UNWANTED_ATTRS);
+        Ok(new)
     }
 
     fn typeset_scenario(e: &Element) -> Result<Element, SubplotError> {