Change AngouriMath reference to use NuGet package instead of git subm…

…odule (#149) * Waiting for AngouriMath to fix bugs * More interval tests * Parse -> Visualize * Updated but more failing tests * Include Visual Studio automatic updates * A lot less failing tests now * Fix intervals with same boundaries * Update simplification of fractions * Update * Update! * Make buildable * Fix typo * Update * Update * Update * Use = instead of -> * Add a calculator to Avalonia Example * Update * Preparing to remove AngouriMath submodule * Use AngouriMath package * Allow matrices in square brackets * Maybe not exponentiations for ordinary matrix environments * Simplify reference * Resolve the new possible test into QuarticSolution * Fix blurry MathButtons & Update Avalonia to 0.10.0-preview2 * Fix test * Fix test (actually)
verybadcat · Jul 29, 2020 · aabb520 · aabb520
1 parent ab9f87c
commit aabb520
Show file tree

Hide file tree

Showing 29 changed files with 456 additions and 500 deletions.
diff --git a/.github/workflows/Test all projects.yml b/.github/workflows/Test all projects.yml
@@ -40,7 +40,6 @@ jobs:
           "CSharpMath.Rendering.Text.Tests"\
           "CSharpMath.Xaml.Tests"\
           "CSharpMath.Xaml.Tests.NuGet"\
-          "AngouriMath/Tests/UnitTests"\
           "Typography/Typography.TextBreak/Typography.TextBreak.UnitTests"
         do
           dotnet add "$p" package Microsoft.NET.Test.Sdk # Update is required for GitHubActionsTestLogger to print anything

diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "Wiki"]
 	path = CSharpMath.Wiki
 	url = https://github.com/verybadcat/CSharpMath.wiki.git
-[submodule "AngouriMath"]
-	path = AngouriMath
-	url = https://github.com/asc-community/AngouriMath
diff --git a/AngouriMath b/AngouriMath
diff --git a/CSharpMath.Avalonia.Example/CSharpMath.Avalonia.Example.csproj b/CSharpMath.Avalonia.Example/CSharpMath.Avalonia.Example.csproj
@@ -9,9 +9,10 @@
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <AvaloniaResource Include="**\*.xaml" />
     <EmbeddedResource Include="..\Icon.png" Link="Icon.png" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview2" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview2" />
     <ProjectReference Include="..\CSharpMath.Avalonia\CSharpMath.Avalonia.csproj" />
+    <ProjectReference Include="..\CSharpMath.Evaluation\CSharpMath.Evaluation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/CSharpMath.Avalonia.Example/MainView.xaml b/CSharpMath.Avalonia.Example/MainView.xaml
@@ -37,6 +37,9 @@
             <TabItem Header="MathButton">
                 <pages:MathButtonPage />
             </TabItem>
+            <TabItem Header="Calculator">
+                <pages:CalculatorPage />
+            </TabItem>
         </TabControl>
 
     </DockPanel>

diff --git a/CSharpMath.Avalonia.Example/MainView.xaml.cs b/CSharpMath.Avalonia.Example/MainView.xaml.cs
@@ -1,22 +1,22 @@
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.Styling;
-
-namespace CSharpMath.Avalonia.Example {
-  public class MainView : UserControl {
-    public MainView() {
-      InitializeComponent();
-
-      var light = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml'/>");
-      var dark = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml'/>");
-      var themes = this.Find<RadioButton>("lightThemeRbn");
-      themes.Checked += (sender, e) => Application.Current.Styles[0] = light;
-      themes.Unchecked += (sender, e) => Application.Current.Styles[0] = dark;
-    }
-
-    private void InitializeComponent() {
-      AvaloniaXamlLoader.Load(this);
-    }
-  }
-}
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+
+namespace CSharpMath.Avalonia.Example {
+  public class MainView : UserControl {
+    public MainView() {
+      InitializeComponent();
+
+      var light = (Styles)AvaloniaXamlLoader.Load(new System.Uri("avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml"));
+      var dark = (Styles)AvaloniaXamlLoader.Load(new System.Uri("avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"));
+      var themes = this.Find<RadioButton>("lightThemeRbn");
+      themes.Checked += (sender, e) => Application.Current.Styles[0] = light;
+      themes.Unchecked += (sender, e) => Application.Current.Styles[0] = dark;
+    }
+
+    private void InitializeComponent() {
+      AvaloniaXamlLoader.Load(this);
+    }
+  }
+}
diff --git a/CSharpMath.Avalonia.Example/Pages/CalculatorPage.xaml b/CSharpMath.Avalonia.Example/Pages/CalculatorPage.xaml
@@ -0,0 +1,30 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:csmath="clr-namespace:CSharpMath.Avalonia;assembly=CSharpMath.Avalonia"
+             xmlns:local="clr-namespace:CSharpMath.Avalonia.Example.Pages"
+             x:Class="CSharpMath.Avalonia.Example.Pages.CalculatorPage">
+
+    <ScrollViewer Margin="0, 8" HorizontalScrollBarVisibility="Auto">
+
+        <StackPanel Spacing="24">
+
+            <StackPanel Spacing="4">
+
+                <TextBlock Classes="h1"
+                           Text="CSharpMath.Evaluation.Evaluate" />
+
+                <TextBlock Classes="h2"
+                           Text="Evaluates a MathList that can be constructed from LaTeX" />
+
+            </StackPanel>
+
+            <TextBox Name="input" AcceptsReturn="True" TextWrapping="Wrap" Text="x^4+4x^3+16x^2+4x+1=y" />
+
+            <csmath:MathView LaTeX="{Binding #input.Text, Converter={x:Static local:CalculatorPageConverter.Singleton}}" />
+
+        </StackPanel>
+
+    </ScrollViewer>
+
+</UserControl>
diff --git a/CSharpMath.Avalonia.Example/Pages/CalculatorPage.xaml.cs b/CSharpMath.Avalonia.Example/Pages/CalculatorPage.xaml.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
+using Avalonia.Markup.Xaml;
+
+namespace CSharpMath.Avalonia.Example.Pages {
+  public class CalculatorPage : UserControl {
+    public CalculatorPage() => AvaloniaXamlLoader.Load(this);
+  }
+  class CalculatorPageConverter : IValueConverter {
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+      value is string latex
+      ? Atom.LaTeXParser.MathListFromLaTeX(latex)
+        .Bind(list => Evaluation.Interpret(list))
+        .Match(success => success, error => latex)
+      : value;
+    object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
+      throw new NotImplementedException();
+    public static CalculatorPageConverter Singleton { get; } = new CalculatorPageConverter();
+  }
+}
diff --git a/CSharpMath.Avalonia/CSharpMath.Avalonia.csproj b/CSharpMath.Avalonia/CSharpMath.Avalonia.csproj
@@ -10,7 +10,8 @@
   <ItemGroup>
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <AvaloniaResource Include="**\*.xaml" />
-    <PackageReference Include="Avalonia" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia" Version="0.10.0-preview2" />
+    <ProjectReference Include="..\CSharpMath.Evaluation\CSharpMath.Evaluation.csproj" />
     <ProjectReference Include="..\CSharpMath.Rendering\CSharpMath.Rendering.csproj" />
   </ItemGroup>