math-core 0.6.4__tar.gz → 0.7.0__tar.gz

{math_core-0.6.4 → math_core-0.7.0}/Cargo.lock

@@ -283,9 +283,9 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.47.2"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4a6248eb93a4401ed2f37dfe8ea592d3cf05b7cf4f8efa867b6895af7e094e"
+checksum = "86f0f8fee8c926415c58d6ae43a08523a26faccb2323f5e6b644fe7dd4ef6b82"
 dependencies = [
  "console",
  "once_cell",
@@ -309,13 +309,12 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
 name = "js-sys"
-version = "0.3.99"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
 dependencies = [
  "cfg-if",
  "futures-util",
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -358,7 +357,7 @@ dependencies = [
 
 [[package]]
 name = "math-core"
-version = "0.6.4"
+version = "0.7.0"
 dependencies = [
  "ariadne",
  "insta",
@@ -378,7 +377,7 @@ dependencies = [
 
 [[package]]
 name = "math-core-cli"
-version = "0.6.4"
+version = "0.7.0"
 dependencies = [
  "ariadne",
  "clap",
@@ -391,7 +390,7 @@ dependencies = [
 
 [[package]]
 name = "math-core-python"
-version = "0.6.4"
+version = "0.7.0"
 dependencies = [
  "ariadne",
  "math-core",
@@ -401,10 +400,12 @@ dependencies = [
 
 [[package]]
 name = "math-core-renderer-internal"
-version = "0.6.4"
+version = "0.7.0"
 dependencies = [
  "bitflags",
  "dtoa",
+ "percent-encoding",
+ "rustc-hash",
  "serde",
  "stable-arena",
  "static_assertions",
@@ -414,7 +415,7 @@ dependencies = [
 
 [[package]]
 name = "math-core-wasm"
-version = "0.6.4"
+version = "0.7.0"
 dependencies = [
  "ariadne",
  "js-sys",
@@ -427,9 +428,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.1"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
 
 [[package]]
 name = "memo-map"
@@ -449,9 +450,9 @@ dependencies = [
 
 [[package]]
 name = "minijinja"
-version = "2.20.0"
+version = "2.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2929e494b2280e1e18959bb2e121da03347ae896896fdfaceaab43c88a02803f"
+checksum = "cb3d648e68cea56d9858d535ee28f9538404e2dd8cb08ed0bd05dca379477f39"
 dependencies = [
  "memo-map",
  "serde",
@@ -494,6 +495,12 @@ version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
 [[package]]
 name = "phf"
 version = "0.13.1"
@@ -566,9 +573,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
+checksum = "cd274650b21d4bfc26a0a47587962c1edb425f69287324355cd040c3ea66071c"
 dependencies = [
  "libc",
  "once_cell",
@@ -580,18 +587,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
+checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
+checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -599,9 +606,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
+checksum = "9ac53762fd065daa3194dd09337a38bd793a188100fd1a9304c4ab312d901771"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -611,13 +618,12 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
+checksum = "4ca3a1557399783172dc5bf39cfca835157732532cba56b71d2292161e53b362"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
  "syn",
 ]
@@ -639,9 +645,9 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -662,9 +668,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "ron"
@@ -964,9 +970,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.122"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -977,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.72"
+version = "0.4.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -987,9 +993,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.122"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -997,9 +1003,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.122"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -1010,18 +1016,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.122"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.72"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74fde991ccdc895cb7fbaa14b137d62af74d9011be67b71c694bfc40edd3119c"
+checksum = "2a0d555ca874445df8d314f94f5c948a4e74e5418f332c89f660a3d8310a96f4"
 dependencies = [
  "async-trait",
  "cast",
@@ -1041,9 +1047,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.72"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e925354648d2a4d1bf205412e36d520a800280622eef4719678d268e5d40e978"
+checksum = "94eb68555b95bcea5e8cf4abe280b529049479fa995bfc23734af96a6aedc120"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1052,9 +1058,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-shared"
-version = "0.2.122"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684365b586a9a6256c1cc3544eee8680de48d6041142f581776ec7b139622ae9"
+checksum = "c31d56021e873866c968588ed85ccdf56db5c426e44afdb4618c39895104b920"
 
 [[package]]
 name = "winapi-util"

{math_core-0.6.4 → math_core-0.7.0}/Cargo.toml

@@ -7,7 +7,7 @@ resolver = "2"
 edition = "2024"
 rust-version = "1.91"
 license = "MIT"
-version = "0.6.4"
+version = "0.7.0"
 repository = "https://github.com/tmke8/math-core"
 
 [workspace.dependencies]

{math_core-0.6.4 → math_core-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: math-core
-Version: 0.6.4
+Version: 0.7.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: License :: OSI Approved :: MIT License
@@ -46,12 +46,12 @@ from math_core import LatexToMathML
 converter = LatexToMathML()
 
 # Convert inline math
-mathml = converter.convert_with_local_counter("x^2 + y^2 = z^2", displaystyle=False)
+mathml = converter.convert_with_local_state("x^2 + y^2 = z^2", displaystyle=False)
 print(mathml)
 # Output: <math><msup><mi>x</mi><mn>2</mn></msup><mo>+</mo><msup><mi>y</mi><mn>2</mn></msup><mo>=</mo><msup><mi>z</mi><mn>2</mn></msup></math>
 
 # Convert display math
-mathml = converter.convert_with_local_counter(r"\frac{1}{2}", displaystyle=True)
+mathml = converter.convert_with_local_state(r"\frac{1}{2}", displaystyle=True)
 print(mathml)
 # Output: <math display="block"><mfrac><mn>1</mn><mn>2</mn></mfrac></math>
 ```
@@ -68,7 +68,7 @@ converter = LatexToMathML(pretty_print="always")
 
 # Convert LaTeX to MathML
 try:
-    mathml = converter.convert_with_local_counter(r"\sqrt{x^2 + 1}", displaystyle=False)
+    mathml = converter.convert_with_local_state(r"\sqrt{x^2 + 1}", displaystyle=False)
     print(mathml)
 except LatexError as e:
     print(f"Conversion error: {e}")
@@ -87,10 +87,10 @@ macros = {
 }
 
 converter = LatexToMathML(macros=macros)
-mathml = converter.convert_with_local_counter(r"\d x", displaystyle=False)
+mathml = converter.convert_with_local_state(r"\d x", displaystyle=False)
 ```
 
-### Numbered Equations with Global Counter
+### Numbered Equations with Global State
 
 For documents with multiple numbered equations:
 
@@ -98,22 +98,22 @@ For documents with multiple numbered equations:
 converter = LatexToMathML()
 
 # First equation gets (1)
-eq1 = converter.convert_with_global_counter(
+eq1 = converter.convert_with_global_state(
     r"\begin{align}E = mc^2\end{align}",
     displaystyle=True
 )
 
 # Second equation gets (2)
-eq2 = converter.convert_with_global_counter(
+eq2 = converter.convert_with_global_state(
     r"\begin{align}F = ma\end{align}",
     displaystyle=True
 )
 
 # Reset counter when starting a new chapter/section
-converter.reset_global_counter()
+converter.reset_global_state()
 
 # This equation gets (1) again
-eq3 = converter.convert_with_global_counter(
+eq3 = converter.convert_with_global_state(
     r"\begin{align}p = mv\end{align}",
     displaystyle=True
 )
@@ -127,12 +127,12 @@ Use local counters when equation numbers should restart within each conversion:
 converter = LatexToMathML()
 
 # Each conversion has independent numbering
-doc1 = converter.convert_with_local_counter(
+doc1 = converter.convert_with_local_state(
     r"\begin{align}a &= b\\c &= d\end{align}",
     displaystyle=True
 )  # Contains (1) and (2)
 
-doc2 = converter.convert_with_local_counter(
+doc2 = converter.convert_with_local_state(
     r"\begin{align}x &= y\\z &= w\end{align}",
     displaystyle=True
 )  # Also contains (1) and (2)
@@ -152,11 +152,12 @@ The main converter class.
 - `ignore_unknown_commands` (`bool`, optional): A boolean indicating whether to ignore unknown LaTeX commands. If `True`, unknown commands be rendered as red text and the conversion will continue. Default: `False`.
 - `annotation` (`bool`, optional): A boolean indicating whether to include the original LaTeX as an annotation in the MathML output. Default: `False`.
 - `fancy_error` (`bool`, optional): A boolean indicating whether to render errors as rich Ariadne diagnostic reports. If `True` (the default), the `LatexError` message contains a formatted diagnostic with source spans. Set to `False` to use compact plain-text messages instead.
+- `unicode_substitution`: A string indicating whether to substitute certain character combinations with a single Unicode symbol.
 
 **Methods:**
-- `convert_with_global_counter(latex: str, displaystyle: bool) -> str | LatexError`: Convert LaTeX to MathML using a global equation counter.
-- `convert_with_local_counter(latex: str, displaystyle: bool) -> str | LatexError`: Convert LaTeX to MathML using a local equation counter.
-- `reset_global_counter() -> None`: Reset the global equation counter to zero.
+- `convert_with_global_state(latex: str, displaystyle: bool) -> str`: Convert LaTeX to MathML using global state. May raise `LatexError`.
+- `convert_with_local_state(latex: str, displaystyle: bool) -> str`: Convert LaTeX to MathML using local state. May raise `LatexError`.
+- `reset_global_state() -> None`: Reset the global state (e.g., set the equation counter to zero).
 
 ### LatexError
 
@@ -167,7 +168,7 @@ from math_core import LatexToMathML, LatexError
 
 converter = LatexToMathML()
 try:
-    result = converter.convert_with_local_counter(r"\invalid")
+    result = converter.convert_with_local_state(r"\invalid")
 except LatexError as e
     print(f"Conversion failed: {e}")
 ```
@@ -188,14 +189,14 @@ def process_math(content):
     # Replace display math $$...$$; do this first to avoid conflicts with inline math delimiters
     content = re.sub(
         r"\$\$([^\$]+)\$\$",
-        lambda m: converter.convert_with_local_counter(m.group(1), displaystyle=True),
+        lambda m: converter.convert_with_local_state(m.group(1), displaystyle=True),
         content,
     )
 
     # Replace inline math $...$
     content = re.sub(
         r"\$([^\$]+)\$",
-        lambda m: converter.convert_with_local_counter(m.group(1), displaystyle=False),
+        lambda m: converter.convert_with_local_state(m.group(1), displaystyle=False),
         content,
     )
 
@@ -216,7 +217,7 @@ converter = LatexToMathML()
 @app.route("/equation/<latex>")
 def render_equation(latex):
     try:
-        mathml = converter.convert_with_local_counter(latex, displaystyle=True)
+        mathml = converter.convert_with_local_state(latex, displaystyle=True)
         return render_template_string(
             "<html><body>{{ mathml|safe }}</body></html>", mathml=mathml
         )

{math_core-0.6.4 → math_core-0.7.0}/crates/math-core/Cargo.toml

@@ -19,7 +19,7 @@ categories = ["science"]
 exclude = ["/src/snapshots", "/tests/snapshots"]
 
 [dependencies]
-mathml-renderer = { path = "../mathml-renderer", package = "math-core-renderer-internal", version = "0.6.4" }
+mathml-renderer = { path = "../mathml-renderer", package = "math-core-renderer-internal", version = "0.7.0" }
 serde = { workspace = true, optional = true }
 serde-tuple-vec-map = { version = "1.0.1", optional = true }
 phf = { version = "0.13.1", features = ["macros"] }
@@ -32,13 +32,13 @@ ariadne = { workspace = true, optional = true }
 
 [dev-dependencies]
 math-core = { path = ".", features = ["serde", "ariadne"] }
-mathml-renderer = { path = "../mathml-renderer", package = "math-core-renderer-internal", version = "0.6.4", features = ["serde"] }
+mathml-renderer = { path = "../mathml-renderer", package = "math-core-renderer-internal", version = "0.7.0", features = ["serde"] }
 insta = { version = "1.47.2", features = ["default", "ron"] }
 regex = "1.12.3"
 minijinja = "2.20.0"
 
 [features]
-serde = ["dep:serde", "dep:serde-tuple-vec-map"]
+serde = ["dep:serde", "dep:serde-tuple-vec-map", "mathml-renderer/serde"]
 ariadne = ["dep:ariadne"]
 
 [lints]

{math_core-0.6.4 → math_core-0.7.0}/crates/math-core/README.md

@@ -60,6 +60,13 @@ You can download precompiled binaries from the GitHub Release page. Alternativel
 cargo install math-core-cli
 ```
 
+Basic usage is this:
+
+```sh
+mathcore --write article.html
+```
+where `--write` indicates that the input file should be overwritten.
+
 You can see an explanation of the CLI interface with
 ```sh
 mathcore --help

{math_core-0.6.4 → math_core-0.7.0}/crates/math-core/examples/browser_test.rs

@@ -9,6 +9,7 @@ fn main() {
         // Chrome bugs:
         r#"\widehat x, \widehat{xxxx}"#,
         r#"\widetilde x, \widetilde{xxxx}"#,
+        r#"\utilde x, \utilde{xxxx}"#,
         r#"\widecheck x, \widecheck{xxxx}"#,
         r#"\overline x, \overline{xxxx}"#,
         r#"\underline x, \underline{xxxx}"#,
@@ -33,8 +34,9 @@ fn main() {
                 "<code>{}</code><p>\n{}\n</p>",
                 input,
                 converter
-                    .convert_with_local_counter(input, MathDisplay::Block)
+                    .convert_with_local_state(input, MathDisplay::Block)
                     .expect(input)
+                    .mathml
             )
         })
         .collect::<Vec<_>>()

{math_core-0.6.4 → math_core-0.7.0}/crates/math-core/examples/equations.rs

@@ -1,4 +1,4 @@
-use math_core::{LatexToMathML, MathCoreConfig, MathDisplay, PrettyPrint};
+use math_core::{LatexToMathML, MathCoreConfig, MathDisplay, PrettyPrint, UnicodeSubstitution};
 
 fn main() {
     let inputs = vec![
@@ -65,6 +65,7 @@ fn main() {
 
     let converter = LatexToMathML::new(MathCoreConfig {
         pretty_print: PrettyPrint::Always,
+        unicode_substitution: UnicodeSubstitution::Never,
         ..Default::default()
     })
     .unwrap();
@@ -75,8 +76,9 @@ fn main() {
                 "<code>{}</code><p>\n{}\n</p>",
                 input,
                 converter
-                    .convert_with_local_counter(input, MathDisplay::Block)
+                    .convert_with_local_state(input, MathDisplay::Block)
                     .expect(input)
+                    .mathml
             )
         })
         .collect::<Vec<_>>()

{math_core-0.6.4 → math_core-0.7.0}/crates/math-core/examples/minijinja.rs

@@ -49,8 +49,8 @@ fn mathml(state: &State, latex: &str) -> Option<Value> {
         .map_err(|_| eprintln!("[error] couldn't get lock for converter"))
         .ok()
         .and_then(|mut c| {
-            c.convert_with_global_counter(latex, MathDisplay::Block)
-                .map(Value::from)
+            c.convert_with_global_state(latex, MathDisplay::Block)
+                .map(|r| Value::from(r.mathml))
                 .ok()
         })
 }

{math_core-0.6.4 → math_core-0.7.0}/crates/math-core/src/character_class.rs

@@ -1,7 +1,7 @@
 use mathml_renderer::{
     arena::Arena,
-    ast::{Node, RowAttrs},
-    attribute::{MathSpacing, OpAttrs, Style, TextTransform},
+    ast::Node,
+    attribute::{MathSpacing, OpAttrs, RowAttrs, Style, TextTransform},
     symbol::{self, MathMLOperator, OrdCategory, OrdLike, Rel, RelCategory},
 };