Revert block equation hack

cetz-package · Oct 15, 2024 · b1d76c1 · b1d76c1
1 parent e59ce5d
commit b1d76c1
Show file tree

Hide file tree

Showing 29 changed files with 10 additions and 13 deletions.
diff --git a/src/plot/formats.typ b/src/plot/formats.typ
@@ -1,6 +1,3 @@
-// Temporary fix Typst measure bug
-#let _block-eq(body) = math.equation(block: true, numbering: none, body)
-
 // Compare two floats
 #let _compare(a, b, eps: 1e-6) = {
   return calc.abs(a - b) <= eps
@@ -59,7 +56,7 @@
 /// - eps (number): Epsilon used for comparison
 /// -> Content if a matching fraction could be found or none
 #let fraction(value, denom: auto, eps: 1e-6) = {
-  return _block-eq(_find-fraction(value, denom: denom, eps: eps))
+  return _find-fraction(value, denom: denom, eps: eps)
 }
 
 /// Multiple of tick formatter
@@ -88,24 +85,24 @@
 /// -> Content if a matching fraction could be found or none
 #let multiple-of(value, factor: calc.pi, symbol: $pi$, fraction: true, digits: 2, eps: 1e-6, prefix: [], suffix: []) = {
   if _compare(value, 0, eps: eps) {
-    return _block-eq($0$)
+    return $0$
   }
 
   let a = value / factor
   if _compare(a, 1, eps: eps) {
-    return _block-eq(prefix + symbol + suffix)
+    return prefix + symbol + suffix
   } else if _compare(a, -1, eps: eps) {
-    return _block-eq(prefix + $-$ + symbol + suffix)
+    return prefix + $-$ + symbol + suffix
   }
 
   if fraction != none {
     let frac = _find-fraction(a, denom: if fraction == true { auto } else { fraction })
     if frac != none {
-      return _block-eq(prefix + frac + symbol + suffix)
+      return prefix + frac + symbol + suffix
     }
   }
 
-  return _block-eq(prefix + $#calc.round(a, digits: digits)$ + symbol + suffix)
+  return prefix + $#calc.round(a, digits: digits)$ + symbol + suffix
 }
 
 /// Scientific notation tick formatter
@@ -140,10 +137,10 @@
 
   value = calc.round(value, digits: digits)
   if exponent <= -1 or exponent >= 1 {
-    return _block-eq(prefix + $#value times 10^#exponent$ + suffix)
+    return prefix + $#value times 10^#exponent$ + suffix
   }
 
-  return _block-eq(prefix + $#value$ + suffix)
+  return prefix + $#value$ + suffix
 }
 
 /// Rounded decimal number formatter
@@ -163,5 +160,5 @@
 /// - suffix (content): Content to append
 /// -> Content
 #let decimal(value, digits: 2, prefix: [], suffix: []) = {
-  _block-eq(prefix + $#calc.round(value, digits: digits)$ + suffix)
+  prefix + $#calc.round(value, digits: digits)$ + suffix
 }
diff --git a/src/plot/util.typ b/src/plot/util.typ
@@ -290,7 +290,7 @@
 
   for (name, axis) in axis-dict {
     if not "ticks" in axis { axis.ticks = () }
-    axis.label = get-axis-option(name, "label", math.equation(block: true, numbering: none, $#name$))
+    axis.label = get-axis-option(name, "label", $#name$)
 
     // Configure axis bounds
     axis.min = get-axis-option(name, "min", axis.min)

diff --git a/tests/axes/log-mode/ref/1.png b/tests/axes/log-mode/ref/1.png
diff --git a/tests/axes/ref/1.png b/tests/axes/ref/1.png
diff --git a/tests/chart/boxwhisker/ref/1.png b/tests/chart/boxwhisker/ref/1.png
diff --git a/tests/chart/ref/1.png b/tests/chart/ref/1.png
diff --git a/tests/plot/annotation/ref/1.png b/tests/plot/annotation/ref/1.png
diff --git a/tests/plot/bar/ref/1.png b/tests/plot/bar/ref/1.png
diff --git a/tests/plot/boxwhisker/ref/1.png b/tests/plot/boxwhisker/ref/1.png
diff --git a/tests/plot/broken-axes/ref/1.png b/tests/plot/broken-axes/ref/1.png
diff --git a/tests/plot/contour/ref/1.png b/tests/plot/contour/ref/1.png
diff --git a/tests/plot/equal-axis/ref/1.png b/tests/plot/equal-axis/ref/1.png
diff --git a/tests/plot/format/ref/1.png b/tests/plot/format/ref/1.png
diff --git a/tests/plot/grid/ref/1.png b/tests/plot/grid/ref/1.png
diff --git a/tests/plot/hvline/ref/1.png b/tests/plot/hvline/ref/1.png
diff --git a/tests/plot/legend/ref/1.png b/tests/plot/legend/ref/1.png
diff --git a/tests/plot/line/between/ref/1.png b/tests/plot/line/between/ref/1.png
diff --git a/tests/plot/line/fill/ref/1.png b/tests/plot/line/fill/ref/1.png
diff --git a/tests/plot/line/line-type/ref/1.png b/tests/plot/line/line-type/ref/1.png
diff --git a/tests/plot/line/linearization/ref/1.png b/tests/plot/line/linearization/ref/1.png
diff --git a/tests/plot/line/mark/ref/1.png b/tests/plot/line/mark/ref/1.png
diff --git a/tests/plot/line/spline/ref/1.png b/tests/plot/line/spline/ref/1.png
diff --git a/tests/plot/marks/ref/1.png b/tests/plot/marks/ref/1.png
diff --git a/tests/plot/mirror-axes/ref/1.png b/tests/plot/mirror-axes/ref/1.png
diff --git a/tests/plot/parametric/ref/1.png b/tests/plot/parametric/ref/1.png
diff --git a/tests/plot/ref/1.png b/tests/plot/ref/1.png
diff --git a/tests/plot/reverse-axis/ref/1.png b/tests/plot/reverse-axis/ref/1.png
diff --git a/tests/plot/vertical/ref/1.png b/tests/plot/vertical/ref/1.png
diff --git a/tests/plot/violin/ref/1.png b/tests/plot/violin/ref/1.png