Remove CSharpMath.Structures namespace

Author: Happypig375

CSharpMath.Core.Example/BackEnd/JsonMathTable.cs

@@ -1,6 +1,5 @@
 using CSharpMath.Display;
 using CSharpMath.Display.FrontEnd;
-using CSharpMath.Structures;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using System.Linq;
@@ -162,7 +161,7 @@ public override (IEnumerable<TGlyph> variants, int count) GetHorizontalVariantsF
       if (variantGlyphs is not JArray variantGlyphsArray) {
         var outputGlyph = GlyphNameProvider.GetGlyph(glyphName);
         if (!outputGlyph.Equals(rawGlyph))
-          throw new InvalidCodePathException
+          throw new Atom.InvalidCodePathException
             ("GlyphNameProvider.GetGlyph(GlyphNameProvider.GetGlyphName(rawGlyph)) != rawGlyph");
         return (new TGlyph[] { outputGlyph }, 1);
       } else
@@ -214,7 +213,7 @@ public override float GetTopAccentAdjustment(TFont font, TGlyph glyph) {
         return FontUnitsToPt(font, nameValue.Value<int>());
       } else {
         // If no top accent is defined then it is the center of the advance width.
-        using var glyphs = new Structures.RentedArray<TGlyph>(glyph);
+        using var glyphs = new Atom.RentedArray<TGlyph>(glyph);
         var (_, Total) = GlyphBoundsProvider.GetAdvancesForGlyphs(font, glyphs.Result, 1);
         return Total / 2;
       }

CSharpMath.Core.Example/BackEnd/TestTypesettingContext.cs

@@ -2,7 +2,7 @@ namespace CSharpMath.Core.BackEnd {
   using CSharpMath.Atom;
   using TGlyph = System.Text.Rune;
   public static class TestTypesettingContext {
-    public static Structures.Result<Display.Displays.ListDisplay<TestFont, System.Text.Rune>>
+    public static Result<Display.Displays.ListDisplay<TestFont, System.Text.Rune>>
       CreateDisplay(string latex) =>
       LaTeXParser.MathListFromLaTeX(latex).Bind(mathList =>
         Display.Typesetter.CreateLine(

CSharpMath.Core.Example/Checker.cs

@@ -4,7 +4,6 @@
 using ListDisplay = CSharpMath.Display.Displays.ListDisplay<CSharpMath.Core.BackEnd.TestFont, System.Text.Rune>;
 
 namespace CSharpMath.Core {
-  using Structures;
   public class Checker {
     /// <summary>Whether you want to view e.g. fraction lines and radical lines
     /// despite viewing character positions with less clarity.</summary>
@@ -56,7 +55,7 @@ void AssignDisplay() {
             });
           }
           AssignDisplay();
-          if (display == null) throw new InvalidCodePathException("display is still not assigned");
+          if (display == null) throw new Atom.InvalidCodePathException("display is still not assigned");
           var x = ReadInt("Input Touch X (integer): ");
           var y = ReadInt("Input Touch Y (integer): ");
           Console.Clear();

CSharpMath.Core.Tests/Atom/DictionaryTests.cs

@@ -1,5 +1,5 @@
 using Xunit;
-using CSharpMath.Structures;
+using CSharpMath.Atom;
 
 namespace CSharpMath.Core.Tests {
   public class DictionaryTests {

CSharpMath.Core.Tests/Atom/LaTeXParserTest.cs

@@ -1279,20 +1279,20 @@ public void TestTeX(string input) {
               CheckAtom<Variable>("T", t => Assert.Equal(FontStyle.Roman, t.FontStyle)),
               CheckAtom<Space>("", space => {
                 Assert.Equal(FontStyle.Roman, space.FontStyle);
-                var expected = -1 / 6f * Structures.Space.EmWidth;
-                Assert.Equal(expected.Length, space.Length);
+                var expected = -1 / 6f * Length.EmWidth;
+                Assert.Equal(expected.Amount, space.Length);
                 Assert.Equal(expected.IsMu, space.IsMu);
               }),
               CheckAtom<RaiseBox>("", raise => {
                 Assert.Equal(FontStyle.Roman, raise.FontStyle);
-                Assert.Equal(-1 / 2f * Structures.Space.ExHeight, raise.Raise);
+                Assert.Equal(-1 / 2f * Length.ExHeight, raise.Raise);
                 Assert.Collection(raise.InnerList,
                   CheckAtom<Variable>("E", e => Assert.Equal(FontStyle.Roman, e.FontStyle)));
               }),
               CheckAtom<Space>("", space => {
                 Assert.Equal(FontStyle.Roman, space.FontStyle);
-                var expected = -1 / 8f * Structures.Space.EmWidth;
-                Assert.Equal(expected.Length, space.Length);
+                var expected = -1 / 8f * Length.EmWidth;
+                Assert.Equal(expected.Amount, space.Length);
                 Assert.Equal(expected.IsMu, space.IsMu);
               }),
               CheckAtom<Variable>("X", x => Assert.Equal(FontStyle.Roman, x.FontStyle))

CSharpMath.Core.Tests/Atom/MathAtomTest.cs

@@ -154,7 +154,7 @@ public void TestCopyAccent() {
     }
     [Fact]
     public void TestCopySpace() {
-      var space = new Space(3 * CSharpMath.Structures.Space.Point);
+      var space = new Space(3 * Length.Point);
       Assert.IsType<Space>(space);
 
       var copy = space.Clone(false);

CSharpMath.Evaluation.Tests/EvaluationTests.cs

@@ -5,7 +5,6 @@
 
 namespace CSharpMath.EvaluationTests {
   using Atom;
-  using CSharpMath.Structures;
 
   public class EvaluationTests {
     internal static MathList ParseLaTeX(string latex) =>

CSharpMath.Evaluation/Evaluation.cs

@@ -8,7 +8,6 @@ namespace CSharpMath {
   using System.Collections;
   using Atom;
   using Atoms = Atom.Atoms;
-  using Structures;
   using System.Numerics;
 
   public static partial class Evaluation {

CSharpMath.Maui.Example/ClockPage.xaml.cs

@@ -52,7 +52,7 @@ public void Draw(ICanvas canvas, RectF dirtyRect) {
         if (i % 5 == 0) {
           painter.LaTeX = labels[i / 5];
           if (!(painter.Measure(dirtyRect.Width) is { } measure))
-            throw new Structures.InvalidCodePathException("Invalid LaTeX");
+            throw new Atom.InvalidCodePathException("Invalid LaTeX");
           var θ = (90 - 6 * i) / 180f * MathF.PI;
           var (sinθ, cosθ) = MathF.SinCos(θ);
           painter.Draw((canvas, dirtyRect.Size),

CSharpMath.Maui.Example/EditorPage.xaml.cs

@@ -95,7 +95,7 @@ await p.ShowPopupAsync(new VerticalStackLayout {
         atomTypes.Text = "Atom Types = " + string.Join
           (", ", viewModel.MathList.Select(x => x.GetType().Name));
         ranges.Text = "Ranges = " + string.Join
-          (", ", (viewModel.Display ?? throw new Structures.InvalidCodePathException("Invalid LaTeX"))
+          (", ", (viewModel.Display ?? throw new Atom.InvalidCodePathException("Invalid LaTeX"))
                  .Displays.Select(x => x.Range));
         index.Text = "Index = " + viewModel.InsertionIndex;
       });