Add MathML Core operator dictionary

Author: mkorje

Cargo.lock

@@ -15,3 +15,6 @@ license = "Apache-2.0"
 
 [features]
 fonts = []
+
+[dependencies]
+bitflags = "2"

Cargo.toml

@@ -827,6 +827,10 @@ The W3C Document license applies to
   https://www.w3.org/TR/referrer-policy/
   Copyright © 2017 World Wide Web Consortium.
 
+* The parts of the data found in `files/mathml/data.rs` that were derived from
+  https://www.w3.org/TR/mathml-core/
+  Copyright © 2025 World Wide Web Consortium.
+
 This work is being provided by the copyright holders under the following license.
 
 # License
@@ -888,4 +892,4 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-================================================================================
+================================================================================

NOTICE

@@ -3,12 +3,11 @@
 //! The spec dir will automatically be populated with the necessary
 //! specifications if one is missing.
 
-use std::borrow::Cow;
-use std::fmt::{Display, Write};
-use std::path::PathBuf;
+use std::fmt::Write;
 
+use crate::*;
 use regex::Regex;
-use scraper::{ElementRef, Html, Selector};
+use scraper::{ElementRef, Selector};
 
 // When referencing more specs, make sure to update the NOTICE file.
 #[rustfmt::skip]
@@ -22,7 +21,7 @@ mod spec {
 
 pub fn main() {
     // Directory where specs will be read from / downloaded into.
-    let dir = std::env::args_os().nth(2).map(PathBuf::from);
+    let dir = std::env::args_os().nth(2).map(std::path::PathBuf::from);
     let mut ctx = Context {
         html: load_spec(&dir, spec::HTML),
         aria: load_spec(&dir, spec::ARIA),
@@ -52,28 +51,6 @@ pub fn main() {
     eprintln!("Success!");
 }
 
-/// Reads a spec from the directory or, if it does not exist, fetches and stores it.
-fn load_spec(spec_dir: &Option<PathBuf>, url: &str) -> ElementRef<'static> {
-    let text = if let Some(dir) = spec_dir {
-        // Extract the last part of the URL as the filename.
-        let name = url.rsplit_terminator("/").next().unwrap();
-        let path = dir.join(name).with_extension("html");
-        if path.exists() {
-            eprintln!("Reading from {}", path.display());
-            std::fs::read_to_string(&path).unwrap()
-        } else {
-            let text = crate::fetch(url);
-            eprintln!("Writing to {}", path.display());
-            std::fs::create_dir_all(dir).unwrap();
-            std::fs::write(&path, &text).unwrap();
-            text
-        }
-    } else {
-        crate::fetch(url)
-    };
-    Box::leak(Box::new(Html::parse_document(&text))).root_element()
-}
-
 struct Context<'a> {
     html: ElementRef<'a>,
     fetch: ElementRef<'a>,
@@ -252,28 +229,6 @@ impl Applicable {
     }
 }
 
-/// Creates a lazily initialized static value.
-macro_rules! lazy {
-    ($ty:ty = $init:expr) => {{
-        static VAL: ::std::sync::LazyLock<$ty> = ::std::sync::LazyLock::new(|| $init);
-        &*VAL
-    }};
-}
-
-/// Creates a static CSS selector.
-macro_rules! s {
-    ($s:literal) => {
-        lazy!(Selector = Selector::parse($s).unwrap())
-    };
-}
-
-/// Creates a lazily initialized regular expression.
-macro_rules! re {
-    ($s:expr) => {
-        lazy!(Regex = Regex::new($s).unwrap())
-    };
-}
-
 /// Collects all attributes with documentation and descriptions.
 fn collect_attributes(ctx: &mut Context) -> Vec<AttrInfo> {
     let mut infos = vec![];
@@ -785,53 +740,3 @@ fn docs(text: &str) -> String {
         .to_owned()
         + "."
 }
-
-/// Helpers methods on [`ElementRef`].
-trait ElementRefExt<'a> {
-    fn inner_text(&self) -> String;
-    fn select_text(&self, selector: &Selector) -> String;
-    fn select_first(&self, selector: &Selector) -> ElementRef<'a>;
-}
-
-impl<'a> ElementRefExt<'a> for ElementRef<'a> {
-    fn inner_text(&self) -> String {
-        self.text().collect()
-    }
-
-    fn select_text(&self, selector: &Selector) -> String {
-        self.select(selector).flat_map(|elem| elem.text()).collect()
-    }
-
-    #[track_caller]
-    fn select_first(&self, selector: &Selector) -> ElementRef<'a> {
-        self.select(selector)
-            .next()
-            .expect("found no matching element")
-    }
-}
-
-trait Join {
-    fn join(self, separator: &str) -> String;
-}
-
-impl<I, T> Join for I
-where
-    I: Iterator<Item = T>,
-    T: Display,
-{
-    fn join(self, separator: &str) -> String {
-        self.map(|v| v.to_string())
-            .collect::<Vec<_>>()
-            .join(separator)
-    }
-}
-
-trait StrExt {
-    fn replace_regex(&self, re: &Regex, replacement: &str) -> Cow<'_, str>;
-}
-
-impl StrExt for str {
-    fn replace_regex(&self, re: &Regex, replacement: &str) -> Cow<'_, str> {
-        re.replace_all(self, replacement)
-    }
-}

codegen/src/html.rs

@@ -4,11 +4,38 @@
 
 use std::io::Read;
 
+use regex::Regex;
+use scraper::{ElementRef, Html, Selector};
+
+/// Creates a lazily initialized static value.
+macro_rules! lazy {
+    ($ty:ty = $init:expr) => {{
+        static VAL: ::std::sync::LazyLock<$ty> = ::std::sync::LazyLock::new(|| $init);
+        &*VAL
+    }};
+}
+
+/// Creates a static CSS selector.
+macro_rules! s {
+    ($s:literal) => {
+        lazy!(Selector = Selector::parse($s).unwrap())
+    };
+}
+
+/// Creates a lazily initialized regular expression.
+macro_rules! re {
+    ($s:expr) => {
+        lazy!(Regex = Regex::new($s).unwrap())
+    };
+}
+
 mod html;
+mod mathml;
 
 fn main() {
     match std::env::args().nth(1).as_deref() {
         Some("html") => html::main(),
+        Some("mathml") => mathml::main(),
         Some(job) => panic!("unknown codegen job: {job}"),
         None => panic!("no codegen job provided"),
     }
@@ -27,3 +54,75 @@ fn fetch(url: &str) -> String {
         .unwrap();
     buf
 }
+
+/// Reads a spec from the directory or, if it does not exist, fetches and stores it.
+fn load_spec(spec_dir: &Option<std::path::PathBuf>, url: &str) -> ElementRef<'static> {
+    let text = if let Some(dir) = spec_dir {
+        // Extract the last part of the URL as the filename.
+        let name = url.rsplit_terminator("/").next().unwrap();
+        let path = dir.join(name).with_extension("html");
+        if path.exists() {
+            eprintln!("Reading from {}", path.display());
+            std::fs::read_to_string(&path).unwrap()
+        } else {
+            let text = fetch(url);
+            eprintln!("Writing to {}", path.display());
+            std::fs::create_dir_all(dir).unwrap();
+            std::fs::write(&path, &text).unwrap();
+            text
+        }
+    } else {
+        crate::fetch(url)
+    };
+    Box::leak(Box::new(Html::parse_document(&text))).root_element()
+}
+
+/// Helpers methods on [`ElementRef`].
+trait ElementRefExt<'a> {
+    fn inner_text(&self) -> String;
+    fn select_text(&self, selector: &Selector) -> String;
+    fn select_first(&self, selector: &Selector) -> ElementRef<'a>;
+}
+
+impl<'a> ElementRefExt<'a> for ElementRef<'a> {
+    fn inner_text(&self) -> String {
+        self.text().collect()
+    }
+
+    fn select_text(&self, selector: &Selector) -> String {
+        self.select(selector).flat_map(|elem| elem.text()).collect()
+    }
+
+    #[track_caller]
+    fn select_first(&self, selector: &Selector) -> ElementRef<'a> {
+        self.select(selector)
+            .next()
+            .expect("found no matching element")
+    }
+}
+
+trait Join {
+    fn join(self, separator: &str) -> String;
+}
+
+impl<I, T> Join for I
+where
+    I: Iterator<Item = T>,
+    T: std::fmt::Display,
+{
+    fn join(self, separator: &str) -> String {
+        self.map(|v| v.to_string())
+            .collect::<Vec<_>>()
+            .join(separator)
+    }
+}
+
+trait StrExt {
+    fn replace_regex(&self, re: &Regex, replacement: &str) -> std::borrow::Cow<'_, str>;
+}
+
+impl StrExt for str {
+    fn replace_regex(&self, re: &Regex, replacement: &str) -> std::borrow::Cow<'_, str> {
+        re.replace_all(self, replacement)
+    }
+}