engine_spx2html: start using the new html::Element type

Author: pkgw

crates/engine_spx2html/src/html.rs

@@ -1,71 +1,79 @@
 // Copyright 2021-2022 the Tectonic Project
 // Licensed under the MIT License.
 
-//! Helpers for working with HTML5 tags.
+//! Helpers for working with HTML5 elements.
 
 use std::str::FromStr;
 
-macro_rules! emit_tag_data {
+macro_rules! emit_element_data {
     ($([
         $vname:ident
         $tagname:literal
         deprecated($deprecated:literal)
         empty($empty:literal)
         autoclosed($($acvname:ident),*)
     ],)+) => {
-        pub enum Tag {
+        #[derive(Clone, Debug, Eq, PartialEq)]
+        pub enum Element {
             $($vname,)+
             Other(String),
         }
 
-        impl FromStr for Tag {
+        impl FromStr for Element {
             type Err = ();
 
             fn from_str(s: &str) -> Result<Self, Self::Err> {
                 Ok(match s {
-                    $($tagname => Tag::$vname,)+
-                    other => Tag::Other(other.to_owned())
+                    $($tagname => Element::$vname,)+
+                    other => Element::Other(other.to_owned())
                 })
             }
         }
 
-        impl Tag {
+        impl Element {
+            pub fn name(&self) -> &str {
+                match self {
+                    $(Element::$vname => $tagname,)+
+                    Element::Other(ref name) => name,
+                }
+            }
+
             pub fn is_deprecated(&self) -> bool {
                 match self {
-                    $(Tag::$vname => $deprecated,)+
-                    Tag::Other(_) => false,
+                    $(Element::$vname => $deprecated,)+
+                    Element::Other(_) => false,
                 }
             }
 
             pub fn is_empty(&self) -> bool {
                 match self {
-                    $(Tag::$vname => $empty,)+
-                    Tag::Other(_) => false,
+                    $(Element::$vname => $empty,)+
+                    Element::Other(_) => false,
                 }
             }
 
             pub fn is_other(&self) -> bool {
-                matches!(self, Tag::Other(_))
+                matches!(self, Element::Other(_))
             }
 
-            pub fn is_autoclosed_by(&self, other: &Tag) -> bool {
+            pub fn is_autoclosed_by(&self, other: &Element) -> bool {
                 match self {
                     $(
-                        Tag::$vname => {
+                        Element::$vname => {
                             match other {
-                                $(Tag::$acvname => true,)*
+                                $(Element::$acvname => true,)*
                                 _ => false
                             }
                         },
                     )+
-                    Tag::Other(_) => false,
+                    Element::Other(_) => false,
                 }
             }
         }
     }
 }
 
-emit_tag_data! {
+emit_element_data! {
     [A "a" deprecated(false) empty(false) autoclosed()],
     [Abbr "abbr" deprecated(false) empty(false) autoclosed()],
     [Acronym "acroynm" deprecated(true) empty(false) autoclosed()],

crates/engine_spx2html/src/lib.rs

@@ -603,10 +603,10 @@ struct EmittingState {
 
 #[derive(Debug)]
 struct ElementState {
-    /// The tag name of the associated HTML element. This is None for the bottom
-    /// item in the stack, or for changes in state that are not associated with
-    /// actual HTML tags.
-    elem: Option<String>,
+    /// The associated HTML element. This is None for the bottom item in the
+    /// stack, or for changes in state that are not associated with actual HTML
+    /// tags.
+    elem: Option<html::Element>,
 
     /// The origin of this element/state-change.
     origin: ElementOrigin,
@@ -707,7 +707,7 @@ impl EmittingState {
             if let Some(e) = cur.elem.as_ref() {
                 self.current_content.push('<');
                 self.current_content.push('/');
-                self.current_content.push_str(e);
+                self.current_content.push_str(e.name());
                 self.current_content.push('>');
             }
         }
@@ -728,11 +728,11 @@ impl EmittingState {
         }
     }
 
-    fn push_elem<D: std::fmt::Display>(&mut self, name: D, origin: ElementOrigin) {
+    fn push_elem(&mut self, name: &str, origin: ElementOrigin) {
         self.close_automatics();
 
         let new_item = ElementState {
-            elem: Some(name.to_string()),
+            elem: Some(name.parse().unwrap()),
             origin,
             ..*self.cur_elstate()
         };
@@ -752,11 +752,11 @@ impl EmittingState {
             if let Some(e) = cur.elem.as_ref() {
                 self.current_content.push('<');
                 self.current_content.push('/');
-                self.current_content.push_str(e);
+                self.current_content.push_str(e.name());
                 self.current_content.push('>');
                 n_closed += 1;
 
-                if e == name {
+                if e.name() == name {
                     break;
                 }
             }
@@ -994,7 +994,7 @@ impl EmittingState {
         }
 
         let mut elstate = ElementState {
-            elem: Some(tagname.to_owned()),
+            elem: Some(tagname.parse().unwrap()),
             origin: ElementOrigin::Manual,
             ..*self.cur_elstate()
         };
@@ -1398,7 +1398,7 @@ impl EmittingState {
             self.push_space_if_needed(x0, Some(fnum));
             self.current_content.push_str("<b>");
             self.elem_stack.push(ElementState {
-                elem: Some("b".to_owned()),
+                elem: Some(html::Element::B),
                 origin: ElementOrigin::FontAuto,
                 active_font: af,
                 ..*self.cur_elstate()
@@ -1409,7 +1409,7 @@ impl EmittingState {
             self.push_space_if_needed(x0, Some(fnum));
             self.current_content.push_str("<i>");
             self.elem_stack.push(ElementState {
-                elem: Some("i".to_owned()),
+                elem: Some(html::Element::I),
                 origin: ElementOrigin::FontAuto,
                 active_font: af,
                 ..*self.cur_elstate()
@@ -1430,7 +1430,7 @@ impl EmittingState {
             .unwrap();
 
             self.elem_stack.push(ElementState {
-                elem: Some("span".to_owned()),
+                elem: Some(html::Element::Span),
                 origin: ElementOrigin::FontAuto,
                 active_font: desired_af,
                 ..*self.cur_elstate()