From 75ee2ef10bc0eeb41128783350695a301016df73 Mon Sep 17 00:00:00 2001
From: "Simon.Coghlan" <Simon.Coghlan@lr.org>
Date: Fri, 20 Sep 2019 15:47:45 +0100
Subject: [PATCH] Fix #60: Failure to convert `array`'s in MathListBuilder -
 Add @"array" as a recognised Table type

---
 .../PreTypesetting/MathListBuilderTest.cs     | 21 +++++++++++++++++++
 CSharpMath/Atoms/Factories/MathAtoms.cs       | 13 ++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CSharpMath.Tests/PreTypesetting/MathListBuilderTest.cs b/CSharpMath.Tests/PreTypesetting/MathListBuilderTest.cs
index 965548de8..d19775211 100644
--- a/CSharpMath.Tests/PreTypesetting/MathListBuilderTest.cs
+++ b/CSharpMath.Tests/PreTypesetting/MathListBuilderTest.cs
@@ -952,5 +952,26 @@ public void TestColor() {
       var latex = MathListBuilder.MathListToString(list);
       Assert.Equal(@"\color{#F00}{a}", latex);
     }
+
+    [Fact]
+    public void TestSingleColumnArray() {
+      var input = @"\begin{array}{l}a=14\\b=15\end{array}";
+      var list = MathLists.FromString(input);
+
+      Assert.Single(list);
+      var latex = MathListBuilder.MathListToString(list);
+      Assert.Equal(@"\begin{array}{l}a=14\\ b=15\end{array}", latex);
+    }
+
+    [Fact]
+    public void TestDoubleColumnArray() {
+      var input = @"\begin{array}{lr}x^2&\:x<0\\x^3&\:x\geq0\end{array}";
+      var list = MathLists.FromString(input);
+
+      Assert.Single(list);
+      var latex = MathListBuilder.MathListToString(list);
+      Assert.Equal(@"\begin{array}{lr}x^2&\: x<0\\ x^3&\: x\geq 0\end{array}", latex);
+    }
+
   }
 }
diff --git a/CSharpMath/Atoms/Factories/MathAtoms.cs b/CSharpMath/Atoms/Factories/MathAtoms.cs
index 4b72b01bd..30f8e6f9b 100644
--- a/CSharpMath/Atoms/Factories/MathAtoms.cs
+++ b/CSharpMath/Atoms/Factories/MathAtoms.cs
@@ -501,12 +501,6 @@ public static Structures.Result<IMathAtom> Table( string environment, List<List<
       Style style;
       var table = new Table(environment) { Cells = rows };
       switch (environment) {
-        case null:
-          table.InterRowAdditionalSpacing = 1;
-          for (int i = 0; i < table.NColumns; i++) {
-            table.SetAlignment(ColumnAlignment.Left, i);
-          }
-          return table;
         case var _ when _matrixEnvironments.TryGetValue(environment, out var delimiters):
           table.Environment = "matrix"; // TableEnvironment is set to matrix as delimiters are converted to latex outside the table.
           table.InterColumnSpacing = 18;
@@ -528,6 +522,13 @@ public static Structures.Result<IMathAtom> Table( string environment, List<List<
           } else {
             return table;
           }
+        case null:
+        case "array":
+          table.InterRowAdditionalSpacing = 1;
+          for (int i = 0; i < table.NColumns; i++) {
+            table.SetAlignment(ColumnAlignment.Left, i);
+          }
+          return table;
         case "eqalign":
         case "split":
         case "aligned":