math-core 0.6.2__tar.gz → 0.6.3__tar.gz

{math_core-0.6.2 → math_core-0.6.3}/Cargo.lock

@@ -358,7 +358,7 @@ dependencies = [
 
 [[package]]
 name = "math-core"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "ariadne",
  "insta",
@@ -378,7 +378,7 @@ dependencies = [
 
 [[package]]
 name = "math-core-cli"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "ariadne",
  "clap",
@@ -391,7 +391,7 @@ dependencies = [
 
 [[package]]
 name = "math-core-python"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "ariadne",
  "math-core",
@@ -401,7 +401,7 @@ dependencies = [
 
 [[package]]
 name = "math-core-renderer-internal"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "bitflags",
  "dtoa",
@@ -414,7 +414,7 @@ dependencies = [
 
 [[package]]
 name = "math-core-wasm"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "ariadne",
  "js-sys",

{math_core-0.6.2 → math_core-0.6.3}/Cargo.toml

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

{math_core-0.6.2 → math_core-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: math-core
-Version: 0.6.2
+Version: 0.6.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: License :: OSI Approved :: MIT License

{math_core-0.6.2 → math_core-0.6.3}/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.2" }
+mathml-renderer = { path = "../mathml-renderer", package = "math-core-renderer-internal", version = "0.6.3" }
 serde = { workspace = true, optional = true }
 serde-tuple-vec-map = { version = "1.0.1", optional = true }
 phf = { version = "0.13.1", features = ["macros"] }
@@ -32,7 +32,7 @@ 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.2", features = ["serde"] }
+mathml-renderer = { path = "../mathml-renderer", package = "math-core-renderer-internal", version = "0.6.3", features = ["serde"] }
 insta = { version = "1.47.2", features = ["default", "ron"] }
 regex = "1.12.3"
 minijinja = "2.20.0"

{math_core-0.6.2 → math_core-0.6.3}/crates/math-core/src/environments.rs

@@ -124,6 +124,16 @@ impl Env {
         }
     }
 
+    pub(super) fn style(self) -> Style {
+        use Env::*;
+        match self {
+            DArray | Align | AlignStar | Aligned | Equation | EquationStar | Gather
+            | GatherStar | Gathered | MultLine => Style::Display,
+            Array | Cases | Matrix | BMatrix | Bmatrix | PMatrix | VMatrix | Vmatrix => Style::Text,
+            Subarray => Style::Script,
+        }
+    }
+
     pub(super) fn construct_node<'arena>(
         self,
         content: &'arena [&'arena Node<'arena>],
@@ -173,7 +183,7 @@ impl Env {
                 let content = arena.push(Node::Table {
                     content,
                     align,
-                    style: None,
+                    style: Some(Style::Text),
                 });
                 const OPEN_BRACE: StretchableOp =
                     StretchableOp::from_ord(symbol::LEFT_CURLY_BRACKET).unwrap();
@@ -186,7 +196,7 @@ impl Env {
                 debug_assert!(array_spec.is_some());
                 let array_spec = unsafe { array_spec.unwrap_unchecked() };
                 let style = match array_variant {
-                    Env::Array => None,
+                    Env::Array => Some(Style::Text),
                     Env::DArray => Some(Style::Display),
                     Env::Subarray => Some(Style::Script),
                     _ => unreachable!(),

{math_core-0.6.2 → math_core-0.6.3}/crates/math-core/src/parser.rs

@@ -1263,14 +1263,7 @@ where
                     &mut self.state.meaningful_newlines,
                     env.meaningful_newlines(),
                 );
-                let old_style = mem::replace(
-                    &mut self.state.style,
-                    if matches!(env, Env::Subarray) {
-                        Style::Script
-                    } else {
-                        Style::Text
-                    },
-                );
+                let old_style = mem::replace(&mut self.state.style, env.style());
                 let old_numbered =
                     mem::replace(&mut self.state.numbered, env.get_numbered_env_state());