From ae1462cdb83bc149e56d3a175a96b402fa529e1d Mon Sep 17 00:00:00 2001
From: Sara Vieira <hey@iamsaravieira.com>
Date: Thu, 22 Dec 2022 14:28:12 +0000
Subject: [PATCH] fix data attrs, support scfript

---
 macros/src/declare.rs      | 2 +-
 typed-html/src/elements.rs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/macros/src/declare.rs b/macros/src/declare.rs
index adcbf7a..6751709 100644
--- a/macros/src/declare.rs
+++ b/macros/src/declare.rs
@@ -357,7 +357,7 @@ impl Declare {
                     write!(f, "<{}", #name)?;
                     #print_attrs
                     for (key, value) in &self.data_attributes {
-                        write!(f, " data-{}=\"{}\"", key,
+                        write!(f, " data-{}=\"{}\"", str::replace(key, "_", "-"),
                                crate::escape_html_attribute(value.to_string()))?;
                     }
                     for (key, value) in &self.aria_attributes {
diff --git a/typed-html/src/elements.rs b/typed-html/src/elements.rs
index 5312da1..ef3c029 100644
--- a/typed-html/src/elements.rs
+++ b/typed-html/src/elements.rs
@@ -31,6 +31,7 @@ macro_rules! marker_trait {
     };
 }
 
+marker_trait!(HTMLContent);
 marker_trait!(MetadataContent);
 marker_trait!(FlowContent);
 marker_trait!(SectioningContent);
@@ -53,7 +54,7 @@ marker_trait!(TableColumnContent);
 declare_elements! {
     html {
         xmlns: Uri,
-    } with [head, body];
+    } with [head, body] HTMLContent;
     head with [title] MetadataContent;
     body with FlowContent;
 
@@ -311,7 +312,7 @@ declare_elements! {
         src: Uri,
         text: String,
         type: String, // TODO could be an enum
-    } in [MetadataContent, FlowContent, PhrasingContent, TableColumnContent] with TextNode;
+    } in [MetadataContent, FlowContent, PhrasingContent, TableColumnContent, HTMLContent] with TextNode;
     section in [FlowContent, SectioningContent] with FlowContent;
     select {
         autocomplete: String,