v0.2.0-beta1

verybadcat · Jan 5, 2019 · 1ebba29 · 1ebba29 · Andreymaygkov666 · Jan 19, 2019
1 parent d13ddf1
commit 1ebba29
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 25 deletions.
diff --git a/CSharpMath.Editor/CSharpMath.Editor.csproj b/CSharpMath.Editor/CSharpMath.Editor.csproj
@@ -3,7 +3,7 @@
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
     <TargetFramework>netstandard1.3</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <PackageVersion>0.2.0-alpha3</PackageVersion>
+    <PackageVersion>0.2.0-beta1</PackageVersion>
     <PackageReleaseNotes>The 0.2.0 Editor Update brings an editor interface to CSharpMath.</PackageReleaseNotes>
     <Description>The base code for a What You See Is What You Get math editor.</Description>
     <PackageId>CSharpMath.Editor</PackageId>
@@ -16,7 +16,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/verybadcat/CSharpMath.git</RepositoryUrl>
     <RepositoryBranch>master</RepositoryBranch>
-    <RepositoryCommit>5751094f494526c7463a7aaef8f531dcc44ef213</RepositoryCommit>
+    <RepositoryCommit>d13ddf112c78a313a611828131e6f35f2442ece6</RepositoryCommit>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Copyright>© CSharpMath Contributors 2018</Copyright>
   </PropertyGroup>

diff --git a/CSharpMath.Editor/Keyboards/MathKeyboard.cs b/CSharpMath.Editor/Keyboards/MathKeyboard.cs
@@ -461,6 +461,7 @@ void RemovePlaceholderIfPresent() {
             break;
           case MathKeyboardInput.Clear:
             MathList.Clear();
+            InsertionIndex = MathListIndex.Level0Index(0);
             break;
           case MathKeyboardInput.Return:
             ReturnPressed?.Invoke(this, EventArgs.Empty);

diff --git a/CSharpMath.Forms/CSharpMath.Forms.csproj b/CSharpMath.Forms/CSharpMath.Forms.csproj
@@ -3,13 +3,13 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
-    <PackageVersion>0.2.0-alpha3</PackageVersion>
+    <PackageVersion>0.2.0-beta1</PackageVersion>
     <Authors>CSharpMath Contributors (verybadcat, Happypig375, charlesroddie, FoggyFinder)</Authors>
     <PackageReleaseNotes>The 0.2.0 Editor Update brings an editor interface to CSharpMath.</PackageReleaseNotes>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/verybadcat/CSharpMath.git</RepositoryUrl>
     <RepositoryBranch>master</RepositoryBranch>
-    <RepositoryCommit>5751094f494526c7463a7aaef8f531dcc44ef213</RepositoryCommit>
+    <RepositoryCommit>d13ddf112c78a313a611828131e6f35f2442ece6</RepositoryCommit>
     <PackageProjectUrl>https://github.com/verybadcat/CSharpMath</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/verybadcat/CSharpMath/blob/master/LICENSE</PackageLicenseUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/verybadcat/CSharpMath/master/Icon.png</PackageIconUrl>

diff --git a/CSharpMath.Forms/MathKeyboard.xaml b/CSharpMath.Forms/MathKeyboard.xaml
@@ -113,11 +113,16 @@
             <Setter Property="Grid.Row" Value="0"/>
             <Setter Property="Command" Value="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Backspace}"/>
         </Style>
+        <Style TargetType="Button" Class="Clear">
+            <Setter Property="Text" Value="⎚"/>
+            <Setter Property="Grid.Column" Value="5"/>
+            <Setter Property="Grid.Row" Value="1"/>
+            <Setter Property="Command" Value="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Clear}"/>
+        </Style>
         <Style TargetType="Button" Class="Enter">
             <Setter Property="Text" Value="⏎"/>
             <Setter Property="Grid.Column" Value="5"/>
-            <Setter Property="Grid.Row" Value="1"/>
-            <Setter Property="Grid.RowSpan" Value="2"/>
+            <Setter Property="Grid.Row" Value="2"/>
             <Setter Property="Command" Value="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Return}"/>
         </Style>
         <Style TargetType="Button" Class="Dismiss">
@@ -170,6 +175,7 @@
             <Button Text="=" Grid.Row="3" Grid.Column="3" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Equals}"/>
             <Button Text="+" Grid.Row="3" Grid.Column="4" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Plus}"/>
             <Button StyleClass="Back"/>
+            <Button StyleClass="Clear"/>
             <Button StyleClass="Dismiss"/>
             <Button StyleClass="Enter"/>
         </Grid>
@@ -196,6 +202,7 @@
             <Button Text="∶" Grid.Row="3" Grid.Column="3" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Ratio}"/>
             <Button Text="," Grid.Row="3" Grid.Column="4" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Comma}"/>
             <Button StyleClass="Back"/>
+            <Button StyleClass="Clear"/>
             <Button StyleClass="Dismiss"/>
             <Button StyleClass="Enter"/>
         </Grid>
@@ -222,6 +229,7 @@
             <Button Text="⸋√⬜" Grid.Row="3" Grid.Column="3" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=NthRoot}"/>
             <Button Text="°" Grid.Row="3" Grid.Column="4" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Degree}"/>
             <Button StyleClass="Back"/>
+            <Button StyleClass="Clear"/>
             <Button StyleClass="Dismiss"/>
             <Button StyleClass="Enter"/>
         </Grid>
@@ -254,10 +262,10 @@
             <Button Text="n" Grid.Row="2" Grid.Column="13" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallN}"/>
             <Button Text="m" Grid.Row="2" Grid.Column="15" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallM}"/>
             <Button Text="α" Grid.Row="3" Grid.Column="5" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallAlpha}"/>
-            <Button Text="Δ" Grid.Row="3" Grid.Column="7" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallDelta}"/>
+            <Button Text="Δ" Grid.Row="3" Grid.Column="7" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=Delta}"/>
             <Button Text="σ" Grid.Row="3" Grid.Column="9" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallSigma}"/>
             <Button Text="μ" Grid.Row="3" Grid.Column="11" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallMu}"/>
-            <Button Text="λ" Grid.Row="3" Grid.Column="13" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallDelta}"/>
+            <Button Text="λ" Grid.Row="3" Grid.Column="13" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallLambda}"/>
             <Button Text="⇧" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Clicked="Shift_Clicked"/>
             <Button StyleClass="Back" Grid.Row="2" Grid.Column="17" Grid.ColumnSpan="3"/>
             <Button StyleClass="Dismiss" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="5"/>
@@ -296,7 +304,7 @@
             <Button Text="ν" Grid.Row="3" Grid.Column="11" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallNu}"/>
             <Button Text="β" Grid.Row="3" Grid.Column="13" Grid.ColumnSpan="2" Command="{i:MathInput Keyboard={StaticResource Keyboard}, Input=SmallBeta}"/>
             <Button Text="⇧" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Clicked="Shift_Clicked"/>
-            <Button StyleClass="Back" Grid.Row="2" Grid.Column="17" Grid.ColumnSpan="3"/>
+            <Button StyleClass="Clear" Grid.Row="2" Grid.Column="17" Grid.ColumnSpan="3"/>
             <Button StyleClass="Dismiss" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="5"/>
             <Button StyleClass="Enter" Grid.Row="3" Grid.Column="15" Grid.RowSpan="1" Grid.ColumnSpan="5"/>
         </Grid>

diff --git a/CSharpMath.Ios/CSharpMath.Ios.csproj b/CSharpMath.Ios/CSharpMath.Ios.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,11 +11,10 @@
     <RootNamespace>CSharpMath.Ios</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>CSharpMath.Ios</AssemblyName>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <NuGetPackageImportStamp></NuGetPackageImportStamp>
     <PackOnBuild>true</PackOnBuild>
     <PackageId>CSharpMath.Ios</PackageId>
-    <PackageVersion>0.2.0-alpha3</PackageVersion>
+    <PackageVersion>0.2.0-beta1</PackageVersion>
     <Authors>CSharpMath Contributors (verybadcat, Happypig375, charlesroddie, FoggyFinder)</Authors>
     <NeutralLanguage>en</NeutralLanguage>
     <PackageLicenseUrl>https://github.com/verybadcat/CSharpMath/blob/master/LICENSE</PackageLicenseUrl>
@@ -29,7 +28,7 @@
     <RepositoryUrl>https://github.com/verybadcat/CSharpMath.git</RepositoryUrl>
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
     <RepositoryBranch>master</RepositoryBranch>
-    <RepositoryCommit>5751094f494526c7463a7aaef8f531dcc44ef213</RepositoryCommit>
+    <RepositoryCommit>d13ddf112c78a313a611828131e6f35f2442ece6</RepositoryCommit>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageIconUrl>https://raw.githubusercontent.com/verybadcat/CSharpMath/master/Icon.png</PackageIconUrl>
   </PropertyGroup>

diff --git a/...sts.CSharp/CSharpMath.NuGetPackageTests.CSharp/CSharpMath.NuGetPackageTests.CSharp.csproj b/...sts.CSharp/CSharpMath.NuGetPackageTests.CSharp/CSharpMath.NuGetPackageTests.CSharp.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSharpMath.Forms" Version="0.1.4" />
+    <PackageReference Include="CSharpMath.Forms" Version="0.2.0-beta1" />
     <PackageReference Include="Xamarin.Forms" Version="3.4.0.1008975" />
   </ItemGroup>
 </Project>
diff --git a/CSharpMath.NuGetPackageTests.CSharp/CSharpMath.NuGetPackageTests.CSharp/MainPage.xaml b/CSharpMath.NuGetPackageTests.CSharp/CSharpMath.NuGetPackageTests.CSharp/MainPage.xaml
@@ -3,6 +3,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:CSharpMath.NuGetPackageTests.CSharp"
              xmlns:math="clr-namespace:CSharpMath.Forms;assembly=CSharpMath.Forms"
+             xmlns:skia="clr-namespace:SkiaSharp.Views.Forms;assembly=SkiaSharp.Views.Forms"
              x:Class="CSharpMath.NuGetPackageTests.CSharp.MainPage">
-    <math:MathView>1+1=2</math:MathView>
+    <StackLayout>
+        <skia:SKCanvasView x:Name="canvas"/>
+        <Button x:Name="b"/>
+    </StackLayout>
 </ContentPage>
diff --git a/CSharpMath.NuGetPackageTests.CSharp/CSharpMath.NuGetPackageTests.CSharp/MainPage.xaml.cs b/CSharpMath.NuGetPackageTests.CSharp/CSharpMath.NuGetPackageTests.CSharp/MainPage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,6 +12,7 @@ public partial class MainPage : ContentPage
 		public MainPage()
 		{
 			InitializeComponent();
+
 		}
 	}
 }
diff --git a/CSharpMath.Rendering/CSharpMath.Rendering.csproj b/CSharpMath.Rendering/CSharpMath.Rendering.csproj
@@ -11,7 +11,7 @@
     <!--NuGet Properties-->
     <PackOnBuild>true</PackOnBuild>
     <PackageId>CSharpMath.Rendering</PackageId>
-    <PackageVersion>0.2.0-alpha3</PackageVersion>
+    <PackageVersion>0.2.0-beta1</PackageVersion>
     <Authors>CSharpMath Contributors (verybadcat, Happypig375, charlesroddie, FoggyFinder)</Authors>
     <PackageLicenseUrl>https://github.com/verybadcat/CSharpMath/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/verybadcat/CSharpMath</PackageProjectUrl>
@@ -24,7 +24,7 @@
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
     <RepositoryUrl>https://github.com/verybadcat/CSharpMath.git</RepositoryUrl>
     <RepositoryBranch>master</RepositoryBranch>
-    <RepositoryCommit>5751094f494526c7463a7aaef8f531dcc44ef213</RepositoryCommit>
+    <RepositoryCommit>d13ddf112c78a313a611828131e6f35f2442ece6</RepositoryCommit>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageIconUrl>https://raw.githubusercontent.com/verybadcat/CSharpMath/master/Icon.png</PackageIconUrl>
   </PropertyGroup>

diff --git a/CSharpMath.SkiaSharp/CSharpMath.SkiaSharp.csproj b/CSharpMath.SkiaSharp/CSharpMath.SkiaSharp.csproj
@@ -3,13 +3,13 @@
     <TargetFramework>netstandard1.3</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
-    <PackageVersion>0.2.0-alpha3</PackageVersion>
+    <PackageVersion>0.2.0-beta1</PackageVersion>
     <Authors>CSharpMath Contributors (verybadcat, Happypig375, charlesroddie, FoggyFinder)</Authors>
     <PackageReleaseNotes>The 0.2.0 Editor Update brings an editor interface to CSharpMath.</PackageReleaseNotes>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/verybadcat/CSharpMath.git</RepositoryUrl>
     <RepositoryBranch>master</RepositoryBranch>
-    <RepositoryCommit>5751094f494526c7463a7aaef8f531dcc44ef213</RepositoryCommit>
+    <RepositoryCommit>d13ddf112c78a313a611828131e6f35f2442ece6</RepositoryCommit>
     <PackageProjectUrl>https://github.com/verybadcat/CSharpMath</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseUrl>https://github.com/verybadcat/CSharpMath/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/CSharpMath.Utils.NuGet/ReleaseData.xml b/CSharpMath.Utils.NuGet/ReleaseData.xml
@@ -2,13 +2,13 @@
 <ReleaseData>
   <_Global->
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
-    <PackageVersion>0.2.0-alpha3</PackageVersion>
+    <PackageVersion>0.2.0-beta1</PackageVersion>
     <Authors>CSharpMath Contributors (verybadcat, Happypig375, charlesroddie, FoggyFinder)</Authors>
     <PackageReleaseNotes>The 0.2.0 Editor Update brings an editor interface to CSharpMath.</PackageReleaseNotes>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/verybadcat/CSharpMath.git</RepositoryUrl>
     <RepositoryBranch>master</RepositoryBranch>
-    <RepositoryCommit>5751094f494526c7463a7aaef8f531dcc44ef213</RepositoryCommit>
+    <RepositoryCommit>d13ddf112c78a313a611828131e6f35f2442ece6</RepositoryCommit>
     <PackageProjectUrl>https://github.com/verybadcat/CSharpMath</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseUrl>https://github.com/verybadcat/CSharpMath/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/CSharpMath/CSharpMath.csproj b/CSharpMath/CSharpMath.csproj
@@ -12,9 +12,9 @@
     <PackageLicenseUrl>https://github.com/verybadcat/CSharpMath/blob/master/LICENSE</PackageLicenseUrl>
     <Copyright>© CSharpMath Contributors 2018</Copyright>
     <PackageTags>math;mathematics;mathematical;formula;equation;equations;expression;tex;latex;render;rendering;display</PackageTags>
-    <PackageVersion>0.2.0-alpha3</PackageVersion>
+    <PackageVersion>0.2.0-beta1</PackageVersion>
     <RepositoryBranch>master</RepositoryBranch>
-    <RepositoryCommit>5751094f494526c7463a7aaef8f531dcc44ef213</RepositoryCommit>
+    <RepositoryCommit>d13ddf112c78a313a611828131e6f35f2442ece6</RepositoryCommit>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageIconUrl>https://raw.githubusercontent.com/verybadcat/CSharpMath/master/Icon.png</PackageIconUrl>
     <PackageId>CSharpMath</PackageId>