Fix broken matrices with alignment and optimize code while we're at it (#935)

4 files changed, 55 insertions, 60 deletions

diff --git a/tests/ref/math/alignment.png b/tests/ref/math/alignment.png
index 2e3c3d5d..917c49e1 100644
--- a/tests/ref/math/alignment.png
+++ b/tests/ref/math/alignment.png
diff --git a/tests/ref/math/matrix-alignment.png b/tests/ref/math/matrix-alignment.png
new file mode 100644
index 00000000..1449553d
--- /dev/null
+++ b/tests/ref/math/matrix-alignment.png
diff --git a/tests/typ/math/alignment.typ b/tests/typ/math/alignment.typ
index 70c52d37..8f12971f 100644
--- a/tests/typ/math/alignment.typ
+++ b/tests/typ/math/alignment.typ
@@ -26,68 +26,8 @@ $
 $
 
 ---
-// Test alternating alignment.
-$
-"a" & "a a a" & "a a" \
-"a a" & "a a" & "a" \
-"a a a" & "a" & "a a a" \
-$
-
----
-// Test alternating alignment in a vector.
-$ vec(
-  "a" & "a a a" & "a a",
-  "a a" & "a a" & "a",
-  "a a a" & "a" & "a a a",
-) $
-
----
-// Test alternating explicit alignment in a matrix.
-$ mat(
-  "a" & "a a a" & "a a";
-  "a a" & "a a" & "a";
-  "a a a" & "a" & "a a a";
-) $
-
----
-// Test alignment in a matrix.
-$ mat(
-  "a", "a a a", "a a";
-  "a a", "a a", "a";
-  "a a a", "a", "a a a";
-) $
-
----
-// Test explicit left alignment in a matrix.
-$ mat(
-  &"a", &"a a a", &"a a";
-  &"a a", &"a a", &"a";
-  &"a a a", &"a", &"a a a";
-) $
-
----
-// Test explicit right alignment in a matrix.
-$ mat(
-  "a"&, "a a a"&, "a a"&;
-  "a a"&, "a a"&, "a"&;
-  "a a a"&, "a"&, "a a a"&;
-) $
-
----
 // Test #460 equations.
 $
 a &=b & quad c&=d \
 e &=f & g&=h
 $
-
-$ mat(&a+b,c;&d, e) $
-$ mat(&a+b&,c;&d&, e) $
-$ mat(&&&a+b,c;&&&d, e) $
-$ mat(.&a+b&.,c;.....&d&....., e) $
-
----
-// Test #454 equations.
-$ mat(-1, 1, 1; 1, -1, 1; 1, 1, -1) $
-$ mat(-1&, 1&, 1&; 1&, -1&, 1&; 1&, 1&, -1&) $
-$ mat(-1&, 1&, 1&; 1, -1, 1; 1, 1, -1) $
-$ mat(&-1, &1, &1; 1, -1, 1; 1, 1, -1) $
diff --git a/tests/typ/math/matrix-alignment.typ b/tests/typ/math/matrix-alignment.typ
new file mode 100644
index 00000000..fd149dd8
--- /dev/null
+++ b/tests/typ/math/matrix-alignment.typ
@@ -0,0 +1,55 @@
+// Test matrix alignment math.
+
+---
+// Test alternating alignment in a vector.
+$ vec(
+  "a" & "a a a" & "a a",
+  "a a" & "a a" & "a",
+  "a a a" & "a" & "a a a",
+) $
+
+---
+// Test alternating explicit alignment in a matrix.
+$ mat(
+  "a" & "a a a" & "a a";
+  "a a" & "a a" & "a";
+  "a a a" & "a" & "a a a";
+) $
+
+---
+// Test alignment in a matrix.
+$ mat(
+  "a", "a a a", "a a";
+  "a a", "a a", "a";
+  "a a a", "a", "a a a";
+) $
+
+---
+// Test explicit left alignment in a matrix.
+$ mat(
+  &"a", &"a a a", &"a a";
+  &"a a", &"a a", &"a";
+  &"a a a", &"a", &"a a a";
+) $
+
+---
+// Test explicit right alignment in a matrix.
+$ mat(
+  "a"&, "a a a"&, "a a"&;
+  "a a"&, "a a"&, "a"&;
+  "a a a"&, "a"&, "a a a"&;
+) $
+
+---
+// Test #460 equations.
+$ mat(&a+b,c;&d, e) $
+$ mat(&a+b&,c;&d&, e) $
+$ mat(&&&a+b,c;&&&d, e) $
+$ mat(.&a+b&.,c;.....&d&....., e) $
+
+---
+// Test #454 equations.
+$ mat(-1, 1, 1; 1, -1, 1; 1, 1, -1) $
+$ mat(-1&, 1&, 1&; 1&, -1&, 1&; 1&, 1&, -1&) $
+$ mat(-1&, 1&, 1&; 1, -1, 1; 1, 1, -1) $
+$ mat(&-1, &1, &1; 1, -1, 1; 1, 1, -1) $