Handle boxes and blocks a bit better in HTML export (#5744)

Co-authored-by: Martin Haug <3874949+reknih@users.noreply.github.com>

3 files changed, 8 insertions, 11 deletions

diff --git a/crates/typst-library/src/model/enum.rs b/crates/typst-library/src/model/enum.rs
index 2d774cbb..4dc834ab 100644
--- a/crates/typst-library/src/model/enum.rs
+++ b/crates/typst-library/src/model/enum.rs
@@ -9,7 +9,7 @@ use crate::foundations::{
     cast, elem, scope, Array, Content, NativeElement, Packed, Show, Smart, StyleChain,
     Styles, TargetElem,
 };
-use crate::html::{attr, tag, HtmlAttr, HtmlElem};
+use crate::html::{attr, tag, HtmlElem};
 use crate::layout::{Alignment, BlockElem, Em, HAlignment, Length, VAlignment, VElem};
 use crate::model::{ListItemLike, ListLike, Numbering, NumberingPattern, ParElem};
 
@@ -229,10 +229,10 @@ impl Show for Packed<EnumElem> {
         if TargetElem::target_in(styles).is_html() {
             let mut elem = HtmlElem::new(tag::ol);
             if self.reversed(styles) {
-                elem = elem.with_attr(HtmlAttr::constant("reversed"), "reversed");
+                elem = elem.with_attr(attr::reversed, "reversed");
             }
             if let Some(n) = self.start(styles).custom() {
-                elem = elem.with_attr(HtmlAttr::constant("start"), eco_format!("{n}"));
+                elem = elem.with_attr(attr::start, eco_format!("{n}"));
             }
             let body = Content::sequence(self.children.iter().map(|item| {
                 let mut li = HtmlElem::new(tag::li);
diff --git a/crates/typst-library/src/model/quote.rs b/crates/typst-library/src/model/quote.rs
index 774384ac..79e9b4e3 100644
--- a/crates/typst-library/src/model/quote.rs
+++ b/crates/typst-library/src/model/quote.rs
@@ -4,7 +4,7 @@ use crate::foundations::{
     cast, elem, Content, Depth, Label, NativeElement, Packed, Show, ShowSet, Smart,
     StyleChain, Styles, TargetElem,
 };
-use crate::html::{tag, HtmlAttr, HtmlElem};
+use crate::html::{attr, tag, HtmlElem};
 use crate::introspection::Locatable;
 use crate::layout::{
     Alignment, BlockBody, BlockElem, Em, HElem, PadElem, Spacing, VElem,
@@ -194,10 +194,7 @@ impl Show for Packed<QuoteElem> {
                 if let Some(Attribution::Content(attribution)) = attribution {
                     if let Some(link) = attribution.to_packed::<LinkElem>() {
                         if let LinkTarget::Dest(Destination::Url(url)) = &link.dest {
-                            elem = elem.with_attr(
-                                HtmlAttr::constant("cite"),
-                                url.clone().into_inner(),
-                            );
+                            elem = elem.with_attr(attr::cite, url.clone().into_inner());
                         }
                     }
                 }
diff --git a/crates/typst-library/src/model/table.rs b/crates/typst-library/src/model/table.rs
index ba792442..82c1cc08 100644
--- a/crates/typst-library/src/model/table.rs
+++ b/crates/typst-library/src/model/table.rs
@@ -9,7 +9,7 @@ use crate::foundations::{
     cast, elem, scope, Content, NativeElement, Packed, Show, Smart, StyleChain,
     TargetElem,
 };
-use crate::html::{tag, HtmlAttr, HtmlAttrs, HtmlElem, HtmlTag};
+use crate::html::{attr, tag, HtmlAttrs, HtmlElem, HtmlTag};
 use crate::introspection::Locator;
 use crate::layout::grid::resolve::{table_to_cellgrid, Cell, CellGrid, Entry};
 use crate::layout::{
@@ -268,10 +268,10 @@ fn show_cell_html(tag: HtmlTag, cell: &Cell, styles: StyleChain) -> Content {
     let mut attrs = HtmlAttrs::default();
     let span = |n: NonZeroUsize| (n != NonZeroUsize::MIN).then(|| n.to_string());
     if let Some(colspan) = span(cell.colspan(styles)) {
-        attrs.push(HtmlAttr::constant("colspan"), colspan);
+        attrs.push(attr::colspan, colspan);
     }
     if let Some(rowspan) = span(cell.rowspan(styles)) {
-        attrs.push(HtmlAttr::constant("rowspan"), rowspan);
+        attrs.push(attr::rowspan, rowspan);
     }
     HtmlElem::new(tag)
         .with_body(Some(cell.body.clone()))