Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/Nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,12 @@ jobs:
dotnet pack -c Release -p:PackageVersion=${{ steps.version.outputs.version }}
cd bin/Release
dotnet nuget push AngouriMath.Interactive.${{ steps.version.outputs.version }}.nupkg --api-key ${{ steps.version.outputs.apikey }} --source "${{ steps.version.outputs.source }}"

- name: 'Pack and publish AngouriMath.Terminal'
run: |
cd Sources/Terminal/AngouriMath.Terminal
dotnet restore
dotnet build -c Release
dotnet pack -c Release -p:PackageVersion=${{ steps.version.outputs.version }}
cd bin/Release
dotnet nuget push AngouriMath.Terminal.${{ steps.version.outputs.version }}.nupkg --api-key ${{ steps.version.outputs.apikey }} --source "${{ steps.version.outputs.source }}"
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<PackageIcon>icon.png</PackageIcon>
<Description>F#-based command line interface for symbolic algebra library AngouriMath</Description>

<Version>1.4.0-preview.3-2</Version>

<PackageTags>$(PackageTags), cli, terminal</PackageTags>
</PropertyGroup>

Expand All @@ -28,9 +26,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Spectre.Console" Version="0.41.0" />
<PackageReference Include="radline" Version="0.5.0" />
<PackageReference Include="Spectre.Console.ImageSharp" Version="0.41.0" />
<PackageReference Include="Spectre.Console" Version="0.54.0" />
<PackageReference Include="RadLine" Version="0.9.0" />
<PackageReference Include="Spectre.Console.ImageSharp" Version="0.54.0" />
</ItemGroup>

</Project>
17 changes: 5 additions & 12 deletions Sources/Terminal/AngouriMath.Terminal/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let lineEditor = getLineEditor AnsiConsole.Console

let rec readAndRespond kernel =
printf "\n"
match readLine lineEditor |> execute kernel with
match readLine lineEditor |> nonNull |> execute kernel with
| PlainTextSuccess text ->
writeLine AnsiConsole.Console text
| LatexSuccess (_, text) ->
Expand All @@ -36,23 +36,16 @@ let handleErrors errors =

"\n\n" |> Console.Write

FigletText "AngouriMath"
|> AlignableExtensions.Centered
|> (fun p -> FigletTextExtensions.Color(p, Color.Pink1))
FigletText("AngouriMath", Justification = Justify.Center, Color = Color.Pink1)
|> AnsiConsole.Console.Write

$@"
Markup($@"
Hi! Type `help ()` to get more info.
" |> Markup
|> AlignableExtensions.Centered
|> AnsiConsole.Console.Write



", Justification = Justify.Center)
|> AnsiConsole.Console.Write

printf "Starting the kernel..."


match createKernel () with
| Result.Error reasons -> handleErrors reasons
| Result.Ok kernel ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AngouriMath" Version="1.4.0-preview.3" />
<ProjectReference Include="..\..\AngouriMath\AngouriMath.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AngouriMath.FSharp" Version="1.4.0-preview.3" />
<ProjectReference Include="..\AngouriMath.FSharp\AngouriMath.FSharp.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.23611.1" />
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.23611.1" />
<PackageReference Include="Plotly.NET" Version="6.0.0-preview.1" />
Expand Down
Loading