Avalonia

.github/workflows/main.yml

@@ -13,7 +13,22 @@ on:
 
 jobs:
   main:
-    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: 'macos'
+            image: 'macos-12'
+            solution: 'WpfMath.Portable.sln'
+          - name: 'linux'
+            image: 'ubuntu-22.04'
+            solution: 'WpfMath.Portable.sln'
+          - name: 'windows'
+            image: 'windows-2022'
+            solution: 'WpfMath.All.sln'
+
+    name: main.${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.image }}
 
     env:
       DOTNET_NOLOGO: 1
@@ -43,10 +58,10 @@ jobs:
             7.0.x
 
       - name: Build
-        run: dotnet build
+        run: dotnet build ${{ matrix.config.solution }}
 
       - name: Pack
-        run: dotnet pack
+        run: dotnet pack ${{ matrix.config.solution }}
 
       - name: Test
-        run: dotnet test
+        run: dotnet test ${{ matrix.config.solution }}

.github/workflows/nuget.yml

@@ -8,9 +8,9 @@ on:
 
 jobs:
   nuget-push:
-    runs-on: windows-2019
+    runs-on: 'windows-2022'
     env:
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      DOTNET_NOLOGO: 1
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
     steps:
@@ -52,25 +52,48 @@ jobs:
           release_name: WPF-Math v${{ steps.version.outputs.version }}
           body_path: ./release-notes.md
 
-      - name: Upload .nupkg file
+      - name: Upload WPF-Math .nupkg file
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release.outputs.upload_url }}
-          asset_name: WPF-Math.${{ steps.version.outputs.version }}.nupkg
+          asset_name: WpfMath.${{ steps.version.outputs.version }}.nupkg
           asset_path: ./src/WpfMath/bin/Release/WpfMath.${{ steps.version.outputs.version }}.nupkg
           asset_content_type: application/zip
 
-      - name: Upload .snupkg file
+      - name: Upload Avalonia-Math .nupkg file
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release.outputs.upload_url }}
-          asset_name: WPF-Math.${{ steps.version.outputs.version }}.snupkg
+          asset_name: AvaloniaMath.${{ steps.version.outputs.version }}.nupkg
+          asset_path: ./src/AvaloniaMath/bin/Release/AvaloniaMath.${{ steps.version.outputs.version }}.nupkg
+          asset_content_type: application/zip
+
+      - name: Upload WPF-Math .snupkg file
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_name: WpfMath.${{ steps.version.outputs.version }}.snupkg
           asset_path: ./src/WpfMath/bin/Release/WpfMath.${{ steps.version.outputs.version }}.snupkg
           asset_content_type: application/zip
 
-      - name: Push a package to NuGet
-        run: dotnet nuget push ./src/WpfMath/bin/Release/WpfMath.${{ steps.version.outputs.version }}.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_TOKEN }}
+      - name: Upload Avalonia-Math .snupkg file
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_name: AvaloniaMath.${{ steps.version.outputs.version }}.snupkg
+          asset_path: ./src/AvaloniaMath/bin/Release/AvaloniaMath.${{ steps.version.outputs.version }}.snupkg
+          asset_content_type: application/zip
+
+      - name: Push WPF-Math package to NuGet
+        run: dotnet nuget push ./src/WpfMath/bin/Release/WpfMath.${{ steps.version.outputs.version }}.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_TOKEN_WPF }}
+
+      - name: Push Avalonia-Math package to NuGet
+        run: dotnet nuget push ./src/AvaloniaMath/bin/Release/AvaloniaMath.${{ steps.version.outputs.version }}.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_TOKEN_AVALONIA }}

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased] (0.14.0)
+### Changed
+- **(Breaking change.)** `WpfMath.Colors.IColorParser::Parse` now accepts `IReadOnlyList` instead of `IEnumerable`.
+
+### Added
+- Avalonia version is now available! Install the **AvaloniaMath** NuGet package to get it.
+
 ## [0.13.1] - 2023-01-29
 ### Fixed
 - [#350: Unable to resolve dependency 'WpfMath.Shared'][issue-350]

Directory.Build.props

@@ -1,7 +1,22 @@
 <Project>
 
-    <PropertyGroup Label="Versioning">
+    <PropertyGroup Label="Packaging">
         <Version>0.13.1</Version>
+        <PackageReleaseNotes>[Fixed]
+- #350: Unable to resolve dependency 'WpfMath.Shared' (https://github.com/ForNeVeR/wpf-math/issues/350)
+        </PackageReleaseNotes>
+        <Copyright>Copyright © Alex Regueiro 2010; Copyright © WPF-Math Contributors 2023</Copyright>
+
+        <Authors>ForNeVeR</Authors>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/ForNeVeR/wpf-math</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/ForNeVeR/wpf-math.git</RepositoryUrl>
+        <PackageTags>latex;formula</PackageTags>
+
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(MSBuildProjectExtension)' == '.csproj' ">

MAINTAINERSHIP.md

@@ -5,24 +5,27 @@ Publish a New Version
 ---------------------
 
 1. Update the copyright year in [the license file][license], if required.
-2. Update the copyright year in `src/WpfMath/WpfMath.csproj`, if required.
-3. Prepare a corresponding entry in [the changelog][changelog] (usually by renaming the "Unreleased" section).
-4. Copy-paste the said entry to the `<PackageReleaseNotes>` element of `src/WpfMath/WpfMath.csproj`.
-5. Set `<Version>` in the `Directory.Build.props` file.
+2. Prepare a corresponding entry in [the changelog][changelog] (usually by renaming the "Unreleased" section).
+3. Set `<Version>` in the `Directory.Build.props` file.
+4. Update the copyright year in `Directory.Build.props`, if required.
+5. Copy-paste the changelog entry to the `<PackageReleaseNotes>` element of `Directory.Build.props` (convert it to the plain text after pasting).
 6. Push a tag in form of `v<VERSION>`, e.g. `v0.0.1`. GitHub Actions will do the rest (push a NuGet package).
 
 Prepare NuGet Package Locally
 -----------------------------
 
 ```console
-$ dotnet pack --configuration Release
+$ dotnet pack WpfMath.All.sln --configuration Release
 ```
 
+(Use `WpfMath.Portable.sln` on Unix-like operating systems; note you won't be able to build and pack the WPF-specific part of the code, though.)
+
 Push a NuGet Package Manually
 -----------------------------
 
 ```console
 $ dotnet nuget push ./src/WpfMath/bin/Release/WpfMath.<VERSION>.nupkg --source https://api.nuget.org/v3/index.json --api-key <YOUR_API_KEY>
+$ dotnet nuget push ./src/AvaloniaMath/bin/Release/AvaloniaMath.<VERSION>.nupkg --source https://api.nuget.org/v3/index.json --api-key <YOUR_API_KEY>
 ```
 
 Runtime Support Policy

README.md

@@ -1,22 +1,35 @@
-WPF-Math [![NuGet][badge-nuget]][nuget]
+WPF-Math
 ========
 
-*WPF-Math* is a .NET library for rendering mathematical formulae using the LaTeX typesetting style, for the WPF framework.
+*WPF-Math* is a .NET library for rendering mathematical formulae using the LaTeX typesetting style, for the WPF and [Avalonia][avalonia] XAML-based frameworks.
 
-It supports the following .NET runtimes:
+- For WPF version, use NuGet package [WpfMath][nuget-wpf]: [![NuGet][badge-nuget-wpf]][nuget-wpf]
+- For Avalonia version, use [AvaloniaMath][nuget-avalonia]: [![NuGet][badge-nuget-avalonia]][nuget-avalonia]
+
+The WPF version supports the following .NET runtimes:
 - .NET Framework 4.5.2 or later
 - .NET Core 3.1 or later
 - .NET 5.0 or later
 
+The Avalonia version supports:
+- .NET Standard 2.0 or later
+- .NET 6 or later
+
 Getting Started
 ---------------
 
 The simplest way of using *WPF-Math* is to render a static formula in a XAML file as follows.
 
 ```xml
-<Window ... xmlns:controls="clr-namespace:WpfMath.Controls;assembly=WpfMath">
+<!-- WPF -->
+<Window … xmlns:controls="clr-namespace:WpfMath.Controls;assembly=WpfMath">
     <controls:FormulaControl Formula="\left(x^2 + 2 \cdot x + 2\right) = 0" />
 </Window>
+
+<!-- Avalonia -->
+<Window … xmlns:controls="clr-namespace:AvaloniaMath.Controls;assembly=AvaloniaMath">
+    <controls:FormulaBlock Formula="\left(x^2 + 2 \cdot x + 2\right) = 0" />
+</Window>
 ```
 
 For a more detailed sample, check out the [example project][example]. It shows the usage of data binding and some advanced concepts.
@@ -111,18 +124,20 @@ Build and Maintenance Instructions
 Build the project using [.NET SDK 7.0][dotnet-sdk] or later. Here's the build and test script:
 
 ```console
-$ dotnet build --configuration Release
-$ dotnet test
+$ dotnet build WpfMath.All.sln --configuration Release
+$ dotnet test WpfMath.All.sln
 ```
 
 To approve the test results if they differ from the existing ones, execute the `scripts/approve-all.ps1` script using PowerShell or PowerShell Core.
 
 To publish the package, execute the following command:
 
 ```console
-$ dotnet pack --configuration Release
+$ dotnet pack WpfMath.All.sln --configuration Release
 ```
 
+For non-Windows systems, substitute `WpfMath.Portable.sln` instead of `WpfMath.All.sln`.
+
 History
 -------
 
@@ -156,11 +171,14 @@ We're very grateful to JMathTeX authors for their work and allowing to redistrib
 
 [alex-regueiro]: https://github.com/alexreg
 [dotnet-sdk]: https://dotnet.microsoft.com/download
+[avalonia]: https://avaloniaui.net/
 [github]: https://github.com/ForNeVeR/wpf-math
 [jmathtex]: http://jmathtex.sourceforge.net/
 [knuth-license]: http://ctan.org/license/knuth
 [launchpad]: https://launchpad.net/wpf-math
 [msbuild]: https://github.com/Microsoft/msbuild
-[nuget]: https://www.nuget.org/packages/WpfMath/
+[nuget-avalonia]: https://www.nuget.org/packages/AvaloniaMath/
+[nuget-wpf]: https://www.nuget.org/packages/WpfMath/
 
-[badge-nuget]: https://img.shields.io/nuget/v/WpfMath.svg
+[badge-nuget-avalonia]: https://img.shields.io/nuget/v/AvaloniaMath.svg
+[badge-nuget-wpf]: https://img.shields.io/nuget/v/WpfMath.svg

WpfMath.sln → WpfMath.All.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2050
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfMath.Example", "src\WpfMath.Example\WpfMath.Example.csproj", "{FB56A927-25E4-4EC9-BA36-3A843C606B34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfMath.Example", "src\WpfMath.Example\WpfMath.Example.csproj", "{FB56A927-25E4-4EC9-BA36-3A843C606B34}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfMath", "src\WpfMath\WpfMath.csproj", "{010A34F1-1F3E-4528-99B4-95054DD45729}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfMath", "src\WpfMath\WpfMath.csproj", "{010A34F1-1F3E-4528-99B4-95054DD45729}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D9341AA3-BF7C-4CC1-8E11-82258967B82F}"
 	ProjectSection(SolutionItems) = preProject
@@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 	EndProjectSection
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WpfMath.Tests", "src\WpfMath.Tests\WpfMath.Tests.fsproj", "{F19E5FB1-EE6B-4A48-A522-41F30676BE41}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "WpfMath.Tests", "src\WpfMath.Tests\WpfMath.Tests.fsproj", "{F19E5FB1-EE6B-4A48-A522-41F30676BE41}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{39669369-C4F6-4AC6-9D35-B4B6086FF172}"
 	ProjectSection(SolutionItems) = preProject
@@ -41,8 +41,12 @@ ProjectSection(SolutionItems) = preProject
 	scripts\verify-encoding.ps1 = scripts\verify-encoding.ps1
 EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaMath", "src\AvaloniaMath\AvaloniaMath.csproj", "{945C8E20-AE99-493E-8A0D-D5880272050B}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{422A1C06-160C-4422-B019-F9B63C6C6877}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaMath.Example", "src\AvaloniaMath.Example\AvaloniaMath.Example.csproj", "{4D9FD5DA-DA8C-4513-8783-413924A76D62}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{B296A539-C985-43AB-B740-7FBE8F85CCFF}"
 ProjectSection(SolutionItems) = preProject
 	.github\workflows\main.yml = .github\workflows\main.yml
@@ -54,6 +58,26 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfMath.ApiTest", "src\WpfMath.ApiTest\WpfMath.ApiTest.csproj", "{3FC6007E-5400-42FB-AD7A-727ADFAB6469}"
 	ProjectSection(ProjectDependencies) = postProject
 		{010A34F1-1F3E-4528-99B4-95054DD45729} = {010A34F1-1F3E-4528-99B4-95054DD45729}
+		{C9B5E02E-04FB-405F-9BEB-6CF4736939EB} = {C9B5E02E-04FB-405F-9BEB-6CF4736939EB}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfMath.ApiTest.Framework", "src\WpfMath.ApiTest.Framework\WpfMath.ApiTest.Framework.csproj", "{204E2BD3-05C6-41E0-998F-0E0AC1530DCC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaMath.ApiTest", "src\AvaloniaMath.ApiTest\AvaloniaMath.ApiTest.csproj", "{54F77EF7-F918-46F8-A615-56BC0BFE8AAB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{945C8E20-AE99-493E-8A0D-D5880272050B} = {945C8E20-AE99-493E-8A0D-D5880272050B}
+		{C9B5E02E-04FB-405F-9BEB-6CF4736939EB} = {C9B5E02E-04FB-405F-9BEB-6CF4736939EB}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{3F2FED19-93A5-440C-B036-FE4A2FBCC49A}"
+	ProjectSection(SolutionItems) = preProject
+		api\WpfMath.net452.verified.cs = api\WpfMath.net452.verified.cs
+		api\WpfMath.netcoreapp3.1.verified.cs = api\WpfMath.netcoreapp3.1.verified.cs
+		api\WpfMath.Shared.net452.verified.cs = api\WpfMath.Shared.net452.verified.cs
+		api\WpfMath.Shared.netcoreapp3.1.verified.cs = api\WpfMath.Shared.netcoreapp3.1.verified.cs
+		api\AvaloniaMath.netstandard2.0.verified.cs = api\AvaloniaMath.netstandard2.0.verified.cs
+		api\AvaloniaMath.net6.0.verified.cs = api\AvaloniaMath.net6.0.verified.cs
+		api\WpfMath.Shared.netstandard2.0.verified.cs = api\WpfMath.Shared.netstandard2.0.verified.cs
 	EndProjectSection
 EndProject
 Global
@@ -62,14 +86,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{010A34F1-1F3E-4528-99B4-95054DD45729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{010A34F1-1F3E-4528-99B4-95054DD45729}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{010A34F1-1F3E-4528-99B4-95054DD45729}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{010A34F1-1F3E-4528-99B4-95054DD45729}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB56A927-25E4-4EC9-BA36-3A843C606B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB56A927-25E4-4EC9-BA36-3A843C606B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB56A927-25E4-4EC9-BA36-3A843C606B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB56A927-25E4-4EC9-BA36-3A843C606B34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{010A34F1-1F3E-4528-99B4-95054DD45729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{010A34F1-1F3E-4528-99B4-95054DD45729}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{010A34F1-1F3E-4528-99B4-95054DD45729}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{010A34F1-1F3E-4528-99B4-95054DD45729}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F19E5FB1-EE6B-4A48-A522-41F30676BE41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F19E5FB1-EE6B-4A48-A522-41F30676BE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F19E5FB1-EE6B-4A48-A522-41F30676BE41}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -82,11 +106,30 @@ Global
 		{3FC6007E-5400-42FB-AD7A-727ADFAB6469}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3FC6007E-5400-42FB-AD7A-727ADFAB6469}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FC6007E-5400-42FB-AD7A-727ADFAB6469}.Release|Any CPU.Build.0 = Release|Any CPU
+		{945C8E20-AE99-493E-8A0D-D5880272050B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{945C8E20-AE99-493E-8A0D-D5880272050B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{945C8E20-AE99-493E-8A0D-D5880272050B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{945C8E20-AE99-493E-8A0D-D5880272050B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D9FD5DA-DA8C-4513-8783-413924A76D62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D9FD5DA-DA8C-4513-8783-413924A76D62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D9FD5DA-DA8C-4513-8783-413924A76D62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D9FD5DA-DA8C-4513-8783-413924A76D62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{204E2BD3-05C6-41E0-998F-0E0AC1530DCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{204E2BD3-05C6-41E0-998F-0E0AC1530DCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{204E2BD3-05C6-41E0-998F-0E0AC1530DCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{204E2BD3-05C6-41E0-998F-0E0AC1530DCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54F77EF7-F918-46F8-A615-56BC0BFE8AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54F77EF7-F918-46F8-A615-56BC0BFE8AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54F77EF7-F918-46F8-A615-56BC0BFE8AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54F77EF7-F918-46F8-A615-56BC0BFE8AAB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B296A539-C985-43AB-B740-7FBE8F85CCFF} = {422A1C06-160C-4422-B019-F9B63C6C6877}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6563FDA0-9C49-4091-AAE3-611169C996D8}
+	EndGlobalSection
 EndGlobal