Under annotations

.github/workflows/Benchmark.yml

@@ -6,7 +6,7 @@ jobs:
     if: (github.event_name == 'pull_request') == github.event.pull_request.head.repo.fork
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         submodules: recursive
     - name: Setup .NET

.github/workflows/Format.yml

@@ -6,11 +6,11 @@ jobs:
     if: (github.event_name == 'pull_request') == github.event.pull_request.head.repo.fork
     runs-on: windows-latest
     steps:
-    - uses: actions/setup-dotnet@main
+    - uses: actions/setup-dotnet@v6
       with:
         dotnet-version: '10.x'
         workloads: maui-ios, maui-maccatalyst, maui-android, wasm-tools
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         submodules: recursive
     - name: Check formatting (Fix with "dotnet format --exclude Typography" at repository root)

.github/workflows/Label.yml

@@ -7,11 +7,12 @@ jobs:
     permissions:
       pull-requests: write # Allow adding a label to this pull request
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         fetch-depth: 0 # Fetch all commit history and tags, instead of the default fetch of only one commit
         ref: ${{ github.event.pull_request.head.sha }}  # Checkout the PR branch
-    - name: If there are changes in PublicAPI.Shipped.txt, fail the workflow
+        allow-unsafe-pr-checkout: true # We confirm that we want to checkout the PR branch even if it is from a forked repository, which is normally unsafe.
+    - name: If there are changes in PublicApi.Shipped.txt, fail the workflow
       if: github.head_ref != 'action/ship-publicapi' # Same branch name specified in Release.yml
       run: |
         $changes = git diff --numstat --shortstat origin/${{ github.base_ref }}...HEAD -- '**/PublicAPI.Shipped.txt' # Note that ** must expand to at least one folder here, this doesn't check root

.github/workflows/Nightly.yml

@@ -8,16 +8,18 @@ jobs:
     permissions:
       contents: write
       packages: write
+      pull-requests: read
     steps:
     - name: Update draft on GitHub Releases
       id: release_drafter
-      uses: release-drafter/release-drafter@v6.0.0 # Pinned to v6.0.0 to avoid v6.1.0 bug: https://github.com/release-drafter/release-drafter/issues/1425
+      if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+      uses: release-drafter/release-drafter@v7
       env:
         GITHUB_TOKEN: ${{ github.token }}
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         submodules: recursive
-    - uses: actions/setup-dotnet@main
+    - uses: actions/setup-dotnet@v6
       with:
         dotnet-version: '10.x'
         workloads: maui, wasm-tools
@@ -43,40 +45,41 @@ jobs:
         $env:RELEASE_NOTES = $env:RELEASE_NOTES -replace ',','%2C' -replace ';','%3B'
 
         dotnet build -c Not.Uno.Example -p:PackageReleaseNotes="$env:RELEASE_NOTES" -p:PackageVersion=${{ steps.release_drafter.outputs.tag_name || format('{0}-pr', github.event.number) }}-ci-${{ github.sha }}
-    - name: Test
-      run: dotnet test --no-build -c Release --solution CSharpMath.slnx
-    #### Awaiting coverlet.MTP at https://github.com/coverlet-coverage/coverlet/pull/1788
-    #    # --collect:"XPlat Code Coverage" means collect test coverage with https://github.com/coverlet-coverage/coverlet
-    #    # Coverlet settings come after --: https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/VSTestIntegration.md#advanced-options-supported-via-runsettings
-    #    dotnet test --solution CSharpMath.slnx -c Release --collect:"XPlat Code Coverage" --results-directory .testcoverage -p:PackageReleaseNotes="$env:RELEASE_NOTES" -p:PackageVersion=${{ steps.release_drafter.outputs.tag_name || format('{0}-pr', github.event.number) }}-ci-${{ github.sha }} -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.IncludeTestAssembly=true
-    #  shell: pwsh
-    #- name: Run ReportGenerator on Test Coverage results
-    #  uses: danielpalme/ReportGenerator-GitHub-Action@5
-    #  with:
-    #    reports: '.testcoverage/**/*.*' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
-    #    targetdir: '.testcoverage/report' # REQUIRED # The directory where the generated report should be saved.
-    #    reporttypes: 'Html' # The output formats and scope (separated by semicolon) Values: Badges, Clover, Cobertura, CsvSummary, Html, HtmlChart, HtmlInline, HtmlInline_AzurePipelines, HtmlInline_AzurePipelines_Dark, HtmlSummary, JsonSummary, Latex, LatexSummary, lcov, MHtml, PngChart, SonarQube, TeamCitySummary, TextSummary, Xml, XmlSummary
-    #    title: 'CSharpMath test coverage results' # Optional title.
-    #    tag: ${{ steps.release_drafter.outputs.tag_name || format('{0}-pr', github.event.number) }}-ci-${{ github.sha }} # Optional tag or build version.
-    #- name: Upload CSharpMath test coverage results as CI artifacts
-    #  uses: actions/upload-artifact@v4
-    #  with:
-    #    name: CSharpMath test coverage results
-    #    path: .testcoverage/
-    #- name: Upload CSharpMath test coverage results to codecov.io
-    #  uses: codecov/codecov-action@v4
-    #  with:
-    #    file: .testcoverage/**/*.xml # optional
-    #    name: CSharpMath test coverage # optional
-    #    fail_ci_if_error: false # optional (default = false)
+    # Coverlet.MTP emits one timestamped OpenCover report per test project below the results directory.
+    # Note: --coverlet-include-test-assembly is intentionally omitted because it cannot work in MTP mode
+    # (the test assembly DLL is the controller process and is locked). GitHubActionsTestLogger.dll will
+    # also be locked. When coverlet hits a locked file, it throws an AggregateException and the entire
+    # coverage collection is aborted — producing no coverage files at all.
+    - name: Test and collect coverage
+      run: dotnet test --no-build -c Release --solution CSharpMath.slnx --results-directory .testcoverage --coverlet --coverlet-output-format opencover --coverlet-exclude '[GitHubActionsTestLogger*]*'
+      shell: pwsh
+    - name: Run ReportGenerator on Test Coverage results
+      uses: danielpalme/ReportGenerator-GitHub-Action@5
+      with:
+        reports: '.testcoverage/**/*coverage.opencover.*.xml'
+        targetdir: '.testcoverage/report'
+        reporttypes: 'Html'
+        title: 'CSharpMath test coverage results'
+        tag: ${{ steps.release_drafter.outputs.tag_name || format('{0}-pr', github.event.number) }}-ci-${{ github.sha }}
+    - name: Upload CSharpMath test coverage results as CI artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: CSharpMath test coverage results
+        path: .testcoverage/
+    - name: Upload CSharpMath test coverage results to codecov.io
+      uses: codecov/codecov-action@v7
+      with:
+        files: .testcoverage/**/*coverage.opencover.*.xml
+        name: CSharpMath test coverage
+        fail_ci_if_error: false
     - name: Upload CSharpMath.Rendering.Tests results as CI artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       if: always() # Run even when a previous step failed: https://stackoverflow.com/a/58859404/5429648
       with:
         name: CSharpMath.Rendering.Tests results
         path: CSharpMath.Rendering.Tests/*/*.png
     - name: Upload NuGet packages as CI artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       if: always()
       with:
         name: NuGet packages
@@ -116,4 +119,4 @@ jobs:
       if: github.event_name == 'push' && github.ref == 'refs/heads/master'
       with:
         branch: gh-pages
-        directory: website/wwwroot
+        directory: website/wwwroot

.github/workflows/Release.yml

@@ -11,10 +11,10 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
       with:
         submodules: recursive
-    - uses: actions/setup-dotnet@main
+    - uses: actions/setup-dotnet@v6
       with:
         dotnet-version: '10.x'
         workloads: maui, wasm-tools

.github/workflows/Test.yml

@@ -11,18 +11,29 @@ jobs:
         os: [ubuntu-latest, macos-26] # windows-latest is tested in Nightly.yml. It also needs special handling with regards to CSharpMath.Uno.Example so it's omitted here.
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: maxim-lobanov/setup-xcode@v1
-      if: startsWith(matrix.os, 'macos')
+    - uses: actions/checkout@v7
       with:
-        # Check required Xcode version for latest "dotnet workload restore": https://github.com/dotnet/macios/releases
-        xcode-version: '26.2' # If this is to be changed, also check macos-version in matrix.os above
-    - uses: actions/setup-dotnet@main
+        submodules: recursive
+    - uses: actions/setup-dotnet@v6
       with:
         dotnet-version: '10.x'
         workloads: ${{ case(startsWith(matrix.os, 'ubuntu'), 'maui-android, wasm-tools', 'maui, wasm-tools') }}
-    - uses: actions/checkout@v6
+    - name: Select recommended Xcode version
+      id: ios-version
+      if: startsWith(matrix.os, 'macos')
+      shell: bash
+      # NOTE: .NET for iOS/tvOS/MacCatalyst checks the major.minor version of Xcode for version validation.
+      # Meanwhile, the available property for us (_RecommendedXcodeVersion) may include a build number like 26.6.1.
+      # We strip any patch component so setup-xcode uses semver range matching (bare "26.6" matches any 26.6.x).
+      # If we passed the full 3-component version like "26.6.1", Node.js's semver.satisfies would require
+      # an exact patch match, which could fail if the runner only has "26.6.0" (or vice versa).
+      # This property is more reliable than trying to derive the Xcode version from the workload version number, since the mapping is
+      # not always 1:1 (e.g. iOS 26.5 → Xcode 26.6), see https://github.com/dotnet/macios/issues/25818
+      run: echo "xcode-version=$(dotnet build CSharpMath.Maui.Example/CSharpMath.Maui.Example.csproj -getProperty:_RecommendedXcodeVersion -f net10.0-ios | cut -d. -f1-2)" >> "$GITHUB_OUTPUT"
+    - uses: maxim-lobanov/setup-xcode@v1
+      if: startsWith(matrix.os, 'macos')
       with:
-        submodules: recursive
+        xcode-version: ${{ steps.ios-version.outputs.xcode-version }}
     - name: Build Everything
       run: dotnet build
     - name: Run Tests

CSharpMath.Core.Example/BackEnd/JsonMathTable.cs

@@ -14,7 +14,7 @@ public class JsonMathTable : FontMathTable<TFont, TGlyph> {
     /// typically loaded from a .json file.</summary>
     private readonly JToken _mathTable;
     private readonly JObject _constantsDictionary;
-    private readonly JObject _assemblyTable;
+    private readonly JObject _vAssemblyTable, _hAssemblyTable;
     private readonly JObject _italicTable;
     public TestFontMeasurer FontMeasurer { get; }
     public TestGlyphNameProvider GlyphNameProvider { get; }
@@ -41,7 +41,8 @@ JObject GetTable(string name) =>
       GlyphBoundsProvider = glyphBoundsProvider;
       _mathTable = mathTable;
       _constantsDictionary = GetTable("constants");
-      _assemblyTable = GetTable("v_assembly");
+      _vAssemblyTable = GetTable("v_assembly");
+      _hAssemblyTable = GetTable("h_assembly");
       _italicTable = GetTable("italic");
     }
     // different from _ConstantFromTable in that the _ConstantFromTable requires
@@ -137,7 +138,18 @@ public override float RadicalExtraAscender(TFont font) =>
     private const string _extenderKey = "extender";
     private const string _glyphKey = "glyph";
     public override IEnumerable<GlyphPart<TGlyph>>? GetVerticalGlyphAssembly(TGlyph rawGlyph, TFont font) =>
-      _assemblyTable[GlyphNameProvider.GetGlyphName(rawGlyph)]?[_assemblyPartsKey] is JArray parts
+      _vAssemblyTable[GlyphNameProvider.GetGlyphName(rawGlyph)]?[_assemblyPartsKey] is JArray parts
+      ? parts.Select(partInfo =>
+        new GlyphPart<TGlyph>(
+          GlyphNameProvider.GetGlyph(partInfo[_glyphKey]!.Value<string>()!),
+          FontUnitsToPt(font, partInfo[_advanceKey]!.Value<int>()),
+          FontUnitsToPt(font, partInfo[_startConnectorKey]!.Value<int>()),
+          FontUnitsToPt(font, partInfo[_endConnectorKey]!.Value<int>()),
+          partInfo[_extenderKey]!.Value<bool>()))
+      // Should have been defined, but let's return null
+      : null;
+    public override IEnumerable<GlyphPart<TGlyph>>? GetHorizontalGlyphAssembly(TGlyph rawGlyph, TFont font) =>
+      _hAssemblyTable[GlyphNameProvider.GetGlyphName(rawGlyph)]?[_assemblyPartsKey] is JArray parts
       ? parts.Select(partInfo =>
         new GlyphPart<TGlyph>(
           GlyphNameProvider.GetGlyph(partInfo[_glyphKey]!.Value<string>()!),

CSharpMath.Core.Example/CSharpMath.Core.Example.csproj

@@ -5,8 +5,9 @@
     <StartupObject>CSharpMath.Core.Checker</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-	<ProjectReference Include="..\CSharpMath\CSharpMath.csproj" />
-	<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-	<EmbeddedResource Include="Resources\latinmodern-math.json" />
+    <ProjectReference Include="..\CSharpMath\CSharpMath.csproj" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <EmbeddedResource Include="Resources\latinmodern-math.json" />
+    <None Include="Resources\MathTableExport.py" />
   </ItemGroup>
 </Project>