From 7a76ad50467086af7cafcb4483ce1c1f50036843 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 5 Sep 2024 12:39:09 +0300 Subject: [PATCH 01/23] chore(deps): Bump pinned libtexpdf, packages license file Closes #2100 --- libtexpdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtexpdf b/libtexpdf index 736a5e753..1891bee5e 160000 --- a/libtexpdf +++ b/libtexpdf @@ -1 +1 @@ -Subproject commit 736a5e7530c13582ea704a061a358d0caa774916 +Subproject commit 1891bee5e0b73165e4a259f910d3ea3fe1df0b42 From ff2a5d1ec4f6b93ce9ce9a077095f42932254de2 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 5 Sep 2024 17:19:46 +0300 Subject: [PATCH 02/23] chore(tooling): Update build-time error messages with current argument suggestion --- Makefile-fonts | 4 ++-- Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile-fonts b/Makefile-fonts index 59b35676b..00616885d 100644 --- a/Makefile-fonts +++ b/Makefile-fonts @@ -9,8 +9,8 @@ if FONT_DOWNLOAD_TOOLS [ -h .sources ] || mkdir -p $@ fonttooling: - $(if $(BSDTAR),,$(error Please set BSDTAR with path or `./configure --enable-developer`)) - $(if $(CURL),,$(error Please set CURL with path or `./configure --enable-developer`)) + $(if $(BSDTAR),,$(error Please set BSDTAR with path or `./configure --enable-developer-mode`)) + $(if $(CURL),,$(error Please set CURL with path or `./configure --enable-developer-mode`)) # Don't let make delete things we had to download .PRECIOUS: .fonts/% .sources/% diff --git a/Makefile.am b/Makefile.am index a77c126d0..ea1d6367f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -467,6 +467,6 @@ gource.webm: else !DEVELOPER_MODE $(PHONY_DEVELOPER_TARGETS): - @: $(error "Please reconfigure using --enable-developer to use developer tooling") + @: $(error "Please reconfigure using --enable-developer-mode to use developer tooling") endif !DEVELOPER_MODE From ffda4a8297ed76498a599f6da5b612dd5ac98279 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 5 Sep 2024 18:56:19 +0300 Subject: [PATCH 03/23] ci(actions): Use startsWith() instead of contains() to avoid poisoned branch names --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63d97460b..caed29383 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,18 +63,18 @@ jobs: run: | make dist - name: Upload source dist artifact - if: ${{ matrix.configuration[0] == 'dynamic' && !contains(github.ref, 'refs/tags/v') }} + if: matrix.configuration[0] == 'dynamic' && !startsWith(github.ref, 'refs/tags/v') uses: actions/upload-artifact@v4 with: name: sile-${{ env.VERSION }} path: sile-${{ env.VERSION }}.zip - name: Append architecture to static binary - if: ${{ matrix.configuration[0] == 'static' }} + if: matrix.configuration[0] == 'static' run: | cp sile sile-${{ env.CARCH }} sha256sum sile-${{ env.CARCH }} | tee -a sile-${{ env.VERSION }}.sha256.txt - name: Upload static binary artifact - if: ${{ matrix.configuration[0] == 'static' && !contains(github.ref, 'refs/tags/v') }} + if: matrix.configuration[0] == 'static' && !startsWith(github.ref, 'refs/tags/v') uses: actions/upload-artifact@v4 with: name: sile-${{ env.CARCH }} From 272c930ed7164b5d3f00c63d70ab91f97ec4e496 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 5 Sep 2024 23:01:24 +0300 Subject: [PATCH 04/23] chore(outputters): Escape Unicode so over-zealous code linters don't flip out Pun intended. Looking at you Fedora, GitHub, and browser based editors. --- outputters/text.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/outputters/text.lua b/outputters/text.lua index 03f05d20e..786d2fd36 100644 --- a/outputters/text.lua +++ b/outputters/text.lua @@ -57,13 +57,13 @@ function outputter:setCursor (x, y, relative) if newy - cursorY > bs then outfile:write("\n") else - outfile:write("‫") + outfile:write("\u{202b}") end elseif newx > cursorX then if newx:tonumber() - cursorX:tonumber() > spc then outfile:write(" ") else - outfile:write("‫") + outfile:write("\u{202b}") end end end From d9b7b01e41f2b9c5945a6e3fd720c393c899d8ab Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 6 Sep 2024 00:01:48 +0300 Subject: [PATCH 05/23] refactor(cli): Satiate clippy's new "never type fallback" lint New in Rust 1.81.0, scheduled to be an error in edition 2024: https://github.com/rust-lang/rust/issues/123748 It looks like mlua v0.10 won't need this workaround: https://github.com/mlua-rs/mlua/commit/3641c9895963af0f50c5706dc26dd829b73b656b --- src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 801344833..dc7e48fb4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -145,7 +145,7 @@ pub fn run( local spec = SILE.parserBits.cliuse:match($module); table.insert(SILE.input.uses, spec) }) - .eval()?; + .eval::<()>()?; // let spec = cliuse.call_function::<_, _, _>("match", module); } } @@ -153,7 +153,7 @@ pub fn run( eprintln!("{full_version}"); } let init: LuaFunction = sile.get("init")?; - init.call::<_, _>(())?; + init.call::<_, ()>(())?; if let Some(inputs) = inputs { let input_filenames: LuaTable = lua.create_table()?; for input in inputs.iter() { @@ -175,7 +175,7 @@ pub fn run( let spec = spec?; let module: LuaString = spec.get("module")?; let options: LuaTable = spec.get("options")?; - r#use.call::<(LuaString, LuaTable), _>((module, options))?; + r#use.call::<(LuaString, LuaTable), ()>((module, options))?; } let input_filenames: LuaTable = sile_input.get("filenames")?; let process_file: LuaFunction = sile.get("processFile")?; @@ -183,12 +183,12 @@ pub fn run( process_file.call::(file?)?; } let finish: LuaFunction = sile.get("finish")?; - finish.call::<_, _>(())?; + finish.call::<_, ()>(())?; } else { let repl_module: LuaString = lua.create_string("core.repl")?; let require: LuaFunction = lua.globals().get("require")?; let repl: LuaTable = require.call::(repl_module)?; - repl.call_method::<_, _>("enter", ())?; + repl.call_method::<_, ()>("enter", ())?; } Ok(()) } From 48e0a5f30617c3f049e6cb83fa15b18320b2ea4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:27:49 +0300 Subject: [PATCH 06/23] chore(deps): Bump DeterminateSystems/magic-nix-cache-action from 7 to 8 (#2109) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- .github/workflows/nix.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index caed29383..1b90cf02c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -146,7 +146,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v13 - name: Cache Nix dependencies - uses: DeterminateSystems/magic-nix-cache-action@v7 + uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Setup developer environment run: | nix develop --command ./bootstrap.sh diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index a1dd0254d..98dc71fba 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -18,7 +18,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v13 - name: Cache Nix dependencies - uses: DeterminateSystems/magic-nix-cache-action@v7 + uses: DeterminateSystems/magic-nix-cache-action@v8 # Upstream package sometimes has flags set that disable flake checking - name: Setup test env run: | From f6a3920736c6e8a5ec56c869c7610cbb323b1e18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:29:45 +0300 Subject: [PATCH 07/23] chore(deps): Bump DeterminateSystems/nix-installer-action from 13 to 14 (#2110) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- .github/workflows/nix.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b90cf02c..9aaac0663 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,7 +144,7 @@ jobs: .sources key: fonts-${{ hashFiles('Makefile-fonts') }} - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v13 + uses: DeterminateSystems/nix-installer-action@v14 - name: Cache Nix dependencies uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Setup developer environment diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 98dc71fba..cd1508dc2 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -16,7 +16,7 @@ jobs: with: fetch-depth: 0 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v13 + uses: DeterminateSystems/nix-installer-action@v14 - name: Cache Nix dependencies uses: DeterminateSystems/magic-nix-cache-action@v8 # Upstream package sometimes has flags set that disable flake checking From d033aee4384f5435e08e93d8237a76662d2e01ac Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 21 Sep 2024 03:03:23 +0300 Subject: [PATCH 08/23] test(fonts): Update regression tests using latest Libertinus fonts release --- Makefile-fonts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile-fonts b/Makefile-fonts index 00616885d..e8e94fe40 100644 --- a/Makefile-fonts +++ b/Makefile-fonts @@ -101,7 +101,7 @@ notobase = $(shell echo $(notdir $1) | sed -e 's/-.*//') .sources/LateefGR-1.200.zip: | .sources $(CURL) -fsSL https://software.sil.org/downloads/r/lateef/$(notdir $@) -o $@ -.sources/Libertinus-%.tar.xz: | .sources +.sources/Libertinus-%.tar.zst: | .sources $(CURL) -fsSL https://github.com/alerque/libertinus/releases/download/v$*/$(notdir $@) -o $@ .sources/roboto-unhinted.zip: | .sources @@ -138,7 +138,7 @@ notobase = $(shell echo $(notdir $1) | sed -e 's/-.*//') $(BSDTAR) -x -f $< -C $(dir $@) $(notdir $@) && \ touch $@ -.fonts/Libertinus%: .sources/Libertinus-7.020.tar.xz | .fonts +.fonts/Libertinus%: .sources/Libertinus-7.050.tar.zst | .fonts $(BSDTAR) -x -f $< -C $(dir $@) --strip-components 3 $(basename $(basename $( Date: Sat, 21 Sep 2024 17:39:38 +0300 Subject: [PATCH 09/23] chore(tests): Update regression test expectations --- tests/alignment.expected | 4 +- tests/bug-1362.expected | 18 +- tests/bug-1495-inline-math-layout.expected | 20 +- tests/bug-1495-math-alone.expected | 4 +- tests/bug-61.expected | 2 +- tests/feat-1365-lists-alternate.expected | 12 +- tests/feat-1365-lists-compact.expected | 12 +- tests/feat-1365-lists-footnote.expected | 8 +- tests/feat-math-display-numbered.expected | 114 ++-- tests/feat-math-display-unnumbered.expected | 24 +- tests/linespacing2.expected | 4 +- tests/math-bigops.expected | 616 ++++++++++---------- tests/math-fractions.expected | 12 +- tests/math-macros.expected | 62 +- tests/math-ops.expected | 54 +- tests/math-spaces.expected | 8 +- tests/math-stretchy.expected | 32 +- tests/math-subsup.expected | 36 +- tests/math-tables-mathml.expected | 204 +++---- tests/math-tables-tex.expected | 204 +++---- tests/math-variants.expected | 412 ++++++------- 21 files changed, 931 insertions(+), 931 deletions(-) diff --git a/tests/alignment.expected b/tests/alignment.expected index 5e51c68d7..4045b6b8f 100644 --- a/tests/alignment.expected +++ b/tests/alignment.expected @@ -11,7 +11,7 @@ Mx 4.5400 Mx 5.0600 T 51 a=5.8700 66 a=4.5700 72 a=5.0000 72 a=5.0000 70 a=4.4700 69 a=5.0600 (Ragged) Mx 66.4459 -T 77 70 2385 w=13.0700 (left) +T 77 70 2435 w=13.0700 (left) Mx 82.0159 Set font Libertinus Serif;10;400;;normal;;;LTR Mx 2.6400 @@ -512,7 +512,7 @@ Mx 2.7100 Mx 5.6000 Mx 4.5400 Mx 5.0600 -T 43 a=3.2200 86 a=5.3100 84 a=3.9000 85 a=3.1600 74 a=2.7100 2361 a=5.6000 70 a=4.4700 69 a=5.0600 (Justified) +T 43 a=3.2200 86 a=5.3100 84 a=3.9000 85 a=3.1600 74 a=2.7100 2398 a=5.6000 70 a=4.4700 69 a=5.0600 (Justified) Mx 62.8736 Set font Libertinus Serif;10;400;;normal;;;LTR Mx 2.6400 diff --git a/tests/bug-1362.expected b/tests/bug-1362.expected index afe0f8a35..3814d837f 100644 --- a/tests/bug-1362.expected +++ b/tests/bug-1362.expected @@ -14,7 +14,7 @@ T 74 81 84 86 78 w=25.0100 (ipsum) Mx 79.6094 T 69 80 77 80 83 w=21.5000 (dolor) Mx 104.7559 -T 69 74 2363 68 86 77 85 w=31.4500 (difficult) +T 69 74 2400 68 86 77 85 w=31.4500 (difficult) Mx 139.8525 Mx 4.4700 Mx 5.8200 @@ -22,13 +22,13 @@ Mx 4.5400 Mx 4.2800 Mx 3.1600 Mx 3.9000 -T 70 a=4.4700 2360 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects) +T 70 a=4.4700 2397 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects) Mx 169.6690 -T 66 2360 66 74 83 84 w=25.2900 (affairs) +T 66 2397 66 74 83 84 w=25.2900 (affairs) Mx 198.6055 T 80 71 w=8.1400 (of) Mx 210.3920 -T 2361 79 74 85 74 80 79 w=30.0600 (finition) +T 2398 79 74 85 74 80 79 w=30.0600 (finition) Mx 244.0986 Mx 2.6400 Mx 5.0400 @@ -197,16 +197,16 @@ T 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4.9000 89 a=4 Mx 378.7012 T 69 74 71 w=10.8700 (dif) Mx 389.5712 -T 2361 w=5.6000 (fi) +T 2398 w=5.6000 (fi) Mx 395.1712 T 14 w=3.3800 (-) Mx 20.9764 My 84.7438 T 68 86 77 85 w=15.3900 (cult) Mx 39.3383 -T 69 74 2363 68 86 77 85 w=31.4500 (difficult) +T 69 74 2400 68 86 77 85 w=31.4500 (difficult) Mx 73.7602 -T 66 2360 66 74 83 84 w=25.2900 (affairs) +T 66 2397 66 74 83 84 w=25.2900 (affairs) Mx 102.0221 Mx 4.4700 Mx 5.8200 @@ -214,11 +214,11 @@ Mx 4.5400 Mx 4.2800 Mx 3.1600 Mx 3.9000 -T 70 a=4.4700 2360 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects) +T 70 a=4.4700 2397 a=5.8200 70 a=4.4700 68 a=4.2800 85 a=3.1600 84 a=3.9000 (effects) Mx 131.1640 T 80 71 w=8.1400 (of) Mx 142.2759 -T 2361 79 74 85 74 80 79 w=30.0600 (finition) +T 2398 79 74 85 74 80 79 w=30.0600 (finition) Mx 175.3078 Mx 2.6400 Mx 5.0400 diff --git a/tests/bug-1495-inline-math-layout.expected b/tests/bug-1495-inline-math-layout.expected index d1036e836..fca44840f 100644 --- a/tests/bug-1495-inline-math-layout.expected +++ b/tests/bug-1495-inline-math-layout.expected @@ -51,11 +51,11 @@ Mx 164.9888 T 80 68 86 86 68 w=24.9365 (massa) Mx 192.9594 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 196.7694 My 37.4447 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 198.6014 T 874 w=4.5280 (nil) Mx 207.3248 @@ -75,7 +75,7 @@ T 10 a=3.5600 (nil) Mx 247.3357 T 30 w=6.4800 (nil) Mx 257.5811 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 264.0611 T 18 w=4.6500 (nil) Mx 271.7452 @@ -100,11 +100,11 @@ Mx 153.4230 T 51 75 68 86 72 79 79 88 86 w=38.3984 (Phasellus) Mx 194.3961 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 198.2061 My 49.5701 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 200.0381 T 866 w=3.9120 (nil) Mx 207.1579 @@ -115,26 +115,26 @@ Mx 216.4157 T 68 80 84 w=13.2200 (nil) Mx 229.6357 Mx 3.0000 -T 3653 a=4.2100 (nil) +T 3798 a=4.2100 (nil) Mx 233.8457 T 866 w=4.8900 (nil) Mx 238.7357 Mx 2.9900 -T 3654 a=4.2100 (nil) +T 3799 a=4.2100 (nil) Mx 244.9625 T 12 w=6.4800 (nil) Mx 253.4592 -T 2720 w=2.2900 (nil) +T 2753 w=2.2900 (nil) Mx 257.4159 T 84 74 79 w=12.0300 (nil) Mx 269.4459 Mx 3.0000 -T 3653 a=4.2100 (nil) +T 3798 a=4.2100 (nil) Mx 273.6559 T 866 w=4.8900 (nil) Mx 278.5459 Mx 2.9900 -T 3654 a=4.2100 (nil) +T 3799 a=4.2100 (nil) Mx 14.8819 My 64.6701 Set font Gentium Plus;10;400;;normal;;;LTR diff --git a/tests/bug-1495-math-alone.expected b/tests/bug-1495-math-alone.expected index 0060a73e8..7e0ac4154 100644 --- a/tests/bug-1495-math-alone.expected +++ b/tests/bug-1495-math-alone.expected @@ -3,8 +3,8 @@ Begin page Mx 14.8819 My 25.3664 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) My 37.3664 -T 2736 w=5.4000 (nil) +T 2769 w=5.4000 (nil) End page Finish diff --git a/tests/bug-61.expected b/tests/bug-61.expected index fbb64e6db..c1fe4a833 100644 --- a/tests/bug-61.expected +++ b/tests/bug-61.expected @@ -19,7 +19,7 @@ T 52 a=5.8200 70 a=5.3640 68 a=5.1360 80 a=6.0480 79 a=6.5040 69 a=6.0720 (Secon Mx 83.3420 T 71 83 66 78 70 w=28.5120 (frame) Mx 115.4640 -T 2361 83 84 85 w=19.6560 (first) +T 2398 83 84 85 w=19.6560 (first) Mx 138.7301 T 81 66 83 66 72 83 66 81 73 w=50.2920 (paragraph) Mx 44.7039 diff --git a/tests/feat-1365-lists-alternate.expected b/tests/feat-1365-lists-alternate.expected index 96514ba2a..8beca4381 100644 --- a/tests/feat-1365-lists-alternate.expected +++ b/tests/feat-1365-lists-alternate.expected @@ -12,7 +12,7 @@ Mx 58.0920 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 79.5201 T 88 74 85 73 w=18.7200 (with) Mx 101.8282 @@ -139,9 +139,9 @@ Mx 44.4056 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 64.1472 -T 66 2385 70 83 w=18.7200 (after) +T 66 2435 70 83 w=18.7200 (after) Mx 84.7688 T 77 74 84 85 w=12.4100 (list) Mx 99.0804 @@ -197,7 +197,7 @@ Mx 56.1706 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 75.6773 Mx 5.0300 Mx 4.4700 @@ -337,9 +337,9 @@ Mx 56.1706 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 75.6773 -T 66 2385 70 83 w=18.7200 (after) +T 66 2435 70 83 w=18.7200 (after) Mx 96.0639 T 77 74 84 85 w=12.4100 (list) Mx 110.1406 diff --git a/tests/feat-1365-lists-compact.expected b/tests/feat-1365-lists-compact.expected index 3f8eaea46..fee9c3a77 100644 --- a/tests/feat-1365-lists-compact.expected +++ b/tests/feat-1365-lists-compact.expected @@ -12,7 +12,7 @@ Mx 58.0920 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 79.5201 T 88 74 85 73 w=18.7200 (with) Mx 101.8282 @@ -150,9 +150,9 @@ Mx 44.4056 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 64.1472 -T 66 2385 70 83 w=18.7200 (after) +T 66 2435 70 83 w=18.7200 (after) Mx 84.7688 T 77 74 84 85 w=12.4100 (list) Mx 99.0804 @@ -208,7 +208,7 @@ Mx 56.1706 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 75.6773 Mx 5.0300 Mx 4.4700 @@ -325,9 +325,9 @@ Mx 56.1706 Mx 5.4000 Mx 4.9700 Mx 7.4700 -T 2362 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) +T 2399 a=5.4000 80 a=5.0400 88 a=7.4700 (flow) Mx 75.6773 -T 66 2385 70 83 w=18.7200 (after) +T 66 2435 70 83 w=18.7200 (after) Mx 96.0639 T 77 74 84 85 w=12.4100 (list) Mx 110.1406 diff --git a/tests/feat-1365-lists-footnote.expected b/tests/feat-1365-lists-footnote.expected index 421bfadfd..1e8b8f2e9 100644 --- a/tests/feat-1365-lists-footnote.expected +++ b/tests/feat-1365-lists-footnote.expected @@ -15,7 +15,7 @@ Mx 64.4073 T 18 w=4.6500 (1) Mx 45.4489 My 67.6452 -T 2222 w=3.5100 (◦) +T 2223 w=3.5100 (◦) Mx 54.7039 Mx 5.2800 Mx 4.4000 @@ -44,7 +44,7 @@ Mx 94.4036 T 20 w=4.6500 (3) Mx 45.4489 My 91.6452 -T 2222 w=3.5100 (◦) +T 2223 w=3.5100 (◦) Mx 54.7039 Mx 5.2800 Mx 4.4000 @@ -105,7 +105,7 @@ Mx 67.3418 T 39 85 w=7.2090 (Ft) Mx 43.3744 My 316.9585 -T 2222 w=3.1590 (◦) +T 2223 w=3.1590 (◦) Mx 51.7039 Mx 4.7520 Mx 3.9600 @@ -133,7 +133,7 @@ Mx 94.3357 T 39 85 w=7.2090 (Ft) Mx 43.3744 My 338.5585 -T 2222 w=3.1590 (◦) +T 2223 w=3.1590 (◦) Mx 51.7039 Mx 4.7520 Mx 3.9600 diff --git a/tests/feat-math-display-numbered.expected b/tests/feat-math-display-numbered.expected index b614bf91d..9632ff1c6 100644 --- a/tests/feat-math-display-numbered.expected +++ b/tests/feat-math-display-numbered.expected @@ -9,11 +9,11 @@ T 77 88 86 87 76 737 72 71 w=36.8940 (justified) Mx 125.8695 My 52.4918 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 129.6795 My 48.7418 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 131.5115 T 874 w=4.5280 (nil) Mx 139.2472 @@ -21,7 +21,7 @@ My 52.4918 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 148.5050 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 154.9850 T 18 w=4.6500 (nil) Mx 270.6226 @@ -46,11 +46,11 @@ T 70 72 81 87 72 85 72 71 w=39.9824 (centered) Mx 125.8695 My 112.0723 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 129.6795 My 108.3223 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 131.5115 T 874 w=4.5280 (nil) Mx 139.2472 @@ -58,7 +58,7 @@ My 112.0723 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 148.5050 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 154.9850 T 18 w=4.6500 (nil) Mx 270.6226 @@ -85,11 +85,11 @@ T 68 79 76 74 81 72 71 w=33.2471 (aligned) Mx 125.8695 My 171.6527 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 129.6795 My 167.9027 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 131.5115 T 874 w=4.5280 (nil) Mx 139.2472 @@ -97,7 +97,7 @@ My 171.6527 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 148.5050 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 154.9850 T 18 w=4.6500 (nil) Mx 270.6226 @@ -130,11 +130,11 @@ T 68 79 76 74 81 72 71 w=33.2471 (aligned) Mx 125.8695 My 231.2332 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 129.6795 My 227.4832 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 131.5115 T 874 w=4.5280 (nil) Mx 139.2472 @@ -142,7 +142,7 @@ My 231.2332 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 148.5050 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 154.9850 T 18 w=4.6500 (nil) Mx 270.6226 @@ -166,63 +166,63 @@ My 267.6234 T 38 88 86 87 82 80 w=34.1279 (Custom) Mx 51.4559 T 70 82 88 81 87 72 85 w=35.4600 (counter) -Mx 96.6255 -My 293.4798 +Mx 96.0755 +My 293.6298 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 2.9400 -T 3796 a=4.0500 (nil) -Mx 100.6883 +T 4118 a=4.0500 (nil) +Mx 100.1383 My 285.3548 -T 2732 w=4.9200 (nil) -Mx 105.2483 +T 2765 w=4.9200 (nil) +Mx 104.6983 My 287.4548 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 115.3983 +Mx 114.8483 My 285.3548 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 127.8783 -T 2689 w=6.2100 (nil) -Mx 100.6755 -My 300.8048 -T 2732 w=4.9200 (nil) -Mx 105.2355 -My 302.9048 +Mx 127.3283 +T 2722 w=6.2100 (nil) +Mx 100.1255 +My 301.1048 +T 2765 w=4.9200 (nil) +Mx 104.6855 +My 303.2048 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 115.3983 -My 300.8048 +T 2758 w=3.7328 (nil) +Mx 114.8483 +My 301.1048 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 127.8783 -T 2729 w=3.8000 (nil) -Mx 133.9005 +Mx 127.3283 +T 2762 w=3.8000 (nil) +Mx 133.3505 T 151 w=5.1000 (nil) -Mx 141.2228 -T 2732 w=4.9200 (nil) -Mx 145.7828 -My 302.9048 +Mx 140.6728 +T 2765 w=4.9200 (nil) +Mx 145.2328 +My 303.2048 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 149.5156 -T 2061 w=5.1840 (nil) -Mx 154.6996 +T 2758 w=3.7328 (nil) +Mx 148.9656 +T 2088 w=5.1840 (nil) +Mx 154.1496 T 18 w=3.7200 (nil) -Mx 158.8496 -My 300.8048 +Mx 158.2996 +My 301.1048 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 162.7162 -T 2043 w=4.8800 (nil) -Mx 167.5962 -T 2725 w=4.7100 (nil) -Mx 175.0840 -T 2589 w=6.4800 (nil) -Mx 184.3418 +Mx 162.1662 +T 2070 w=5.9800 (nil) +Mx 168.1462 +T 2758 w=4.7100 (nil) +Mx 175.6340 +T 2618 w=6.4800 (nil) +Mx 184.8918 T 18 w=4.6500 (nil) Mx 270.7354 -My 293.4798 +My 293.6298 Set font Gentium Plus;11;400;;normal;;;LTR T 11 w=3.4858 (() Mx 274.2212 @@ -230,28 +230,28 @@ T 68 w=5.0488 (a) Mx 279.2701 T 12 w=3.4858 ()) Mx 14.8819 -My 322.3002 +My 322.6002 T 39 76 85 72 70 87 w=27.5322 (Direct) Mx 44.8592 T 81 88 80 69 72 85 76 81 74 w=50.1714 (numbering) Mx 122.9207 -My 345.4905 +My 345.7905 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 18 w=4.6500 (nil) Mx 130.3485 T 30 w=6.4800 (nil) Mx 139.6063 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 146.0863 -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 149.8963 -My 341.7405 +My 342.0405 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 151.7283 T 874 w=4.5280 (nil) Mx 264.7251 -My 345.4905 +My 345.7905 Set font Gentium Plus;11;400;;normal;;;LTR T 11 w=3.4858 (() Mx 268.2110 diff --git a/tests/feat-math-display-unnumbered.expected b/tests/feat-math-display-unnumbered.expected index aa5fc0afa..24493b35f 100644 --- a/tests/feat-math-display-unnumbered.expected +++ b/tests/feat-math-display-unnumbered.expected @@ -9,11 +9,11 @@ T 77 88 86 87 76 737 72 71 w=35.0493 (justified) Mx 131.9361 My 51.4155 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 135.7461 My 47.6655 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 137.5781 T 874 w=4.5280 (nil) Mx 145.3139 @@ -21,7 +21,7 @@ My 51.4155 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 154.5717 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 161.0517 T 18 w=4.6500 (nil) Mx 36.8819 @@ -40,11 +40,11 @@ T 70 72 81 87 72 85 72 71 w=37.9833 (centered) Mx 131.9361 My 109.0160 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 135.7461 My 105.2660 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 137.5781 T 874 w=4.5280 (nil) Mx 145.3139 @@ -52,7 +52,7 @@ My 109.0160 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 154.5717 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 161.0517 T 18 w=4.6500 (nil) Mx 120.4845 @@ -73,11 +73,11 @@ T 68 79 76 74 81 72 71 w=31.5847 (aligned) Mx 131.9361 My 166.6165 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 135.7461 My 162.8665 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 137.5781 T 874 w=4.5280 (nil) Mx 145.3139 @@ -85,7 +85,7 @@ My 166.6165 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 154.5717 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 161.0517 T 18 w=4.6500 (nil) Mx 36.8819 @@ -112,11 +112,11 @@ T 68 79 76 74 81 72 71 w=31.5847 (aligned) Mx 131.9361 My 224.2170 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2717 w=3.8100 (nil) +T 2750 w=3.8100 (nil) Mx 135.7461 My 220.4670 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 137.5781 T 874 w=4.5280 (nil) Mx 145.3139 @@ -124,7 +124,7 @@ My 224.2170 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) Mx 154.5717 -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 161.0517 T 18 w=4.6500 (nil) Mx 185.5343 diff --git a/tests/linespacing2.expected b/tests/linespacing2.expected index 9db776ed1..888a446be 100644 --- a/tests/linespacing2.expected +++ b/tests/linespacing2.expected @@ -552,7 +552,7 @@ Mx 192.4927 Set font Libertinus Serif;10;400;;normal;;;LTR T 82 86 74 w=13.0500 (qui) Mx 209.1565 -T 80 2363 68 74 66 w=24.8900 (officia) +T 80 2400 68 74 66 w=24.8900 (officia) Mx 237.6602 T 69 70 84 70 83 86 79 85 w=35.5100 (deserunt) Mx 276.7840 @@ -861,7 +861,7 @@ T 68 86 77 81 66 w=21.9900 (culpa) Mx 437.3238 T 82 86 74 w=13.0500 (qui) Mx 452.8858 -T 80 2363 68 74 66 w=24.8900 (officia) +T 80 2400 68 74 66 w=24.8900 (officia) Mx 480.2878 T 69 70 84 70 83 86 79 85 w=35.5100 (deserunt) Mx 518.3098 diff --git a/tests/math-bigops.expected b/tests/math-bigops.expected index f9d028440..3d29d71fc 100644 --- a/tests/math-bigops.expected +++ b/tests/math-bigops.expected @@ -19,30 +19,30 @@ T 29 w=2.2900 (:) Mx 179.4182 My 47.7505 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 171.1682 My 52.8405 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2223 w=8.2500 (nil) +T 2250 w=8.2500 (nil) Mx 179.4182 My 55.6505 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2721 w=2.5392 (nil) +T 2754 w=2.5392 (nil) Mx 181.9574 T 30 w=5.1840 (nil) Mx 187.1414 T 17 w=3.7200 (nil) Mx 202.9781 My 47.7505 -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 192.9581 My 52.8405 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2058 w=10.0200 (nil) +T 2085 w=10.0200 (nil) Mx 202.9781 My 55.6505 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 206.7109 T 30 w=5.1840 (nil) Mx 211.8949 @@ -53,11 +53,11 @@ T 79 w=4.3360 (nil) Mx 217.7116 My 52.8405 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2060 w=8.4700 (nil) +T 2087 w=8.4700 (nil) Mx 226.1816 My 55.6205 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2724 w=5.6752 (nil) +T 2757 w=5.6752 (nil) Mx 231.8568 T 30 w=5.1840 (nil) Mx 237.0408 @@ -73,11 +73,11 @@ T 78 w=4.7400 (nil) Mx 247.3274 My 48.7785 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2060 w=6.7760 (nil) +T 2087 w=6.7760 (nil) Mx 254.1034 My 51.0025 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 255.4774 T 30 w=3.8880 (nil) Mx 259.3654 @@ -89,11 +89,11 @@ T 862 w=3.9280 (nil) Mx 268.0941 My 50.4585 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 269.4681 T 13 w=1.3200 (nil) Mx 270.7881 -T 2721 w=1.8288 (nil) +T 2754 w=1.8288 (nil) Mx 276.2451 My 52.8405 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -127,30 +127,30 @@ T 29 w=2.2900 (:) Mx 238.1178 My 68.4073 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2073 w=11.3040 (nil) +T 2100 w=11.3040 (nil) Mx 223.2678 My 77.5693 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2223 w=14.8500 (nil) +T 2250 w=14.8500 (nil) Mx 238.1178 My 82.6273 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2721 w=4.5706 (nil) +T 2754 w=4.5706 (nil) Mx 242.6883 T 30 w=9.3312 (nil) Mx 252.0195 T 17 w=6.6960 (nil) Mx 280.5255 My 68.4073 -T 2073 w=11.3040 (nil) +T 2100 w=11.3040 (nil) Mx 262.4895 My 77.5693 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2058 w=18.0360 (nil) +T 2085 w=18.0360 (nil) Mx 280.5255 My 82.6273 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2725 w=6.7190 (nil) +T 2758 w=6.7190 (nil) Mx 287.2446 T 30 w=9.3312 (nil) Mx 296.5758 @@ -161,11 +161,11 @@ T 79 w=7.8048 (nil) Mx 307.0458 My 77.5693 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2060 w=15.2460 (nil) +T 2087 w=15.2460 (nil) Mx 322.2918 My 82.5733 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2724 w=10.2154 (nil) +T 2757 w=10.2154 (nil) Mx 332.5071 T 30 w=9.3312 (nil) Mx 341.8383 @@ -181,11 +181,11 @@ T 78 w=8.5320 (nil) Mx 360.3543 My 70.2577 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2060 w=12.1968 (nil) +T 2087 w=12.1968 (nil) Mx 372.5511 My 74.2609 Set font Libertinus Math;10.8;400;Regular;normal;;;LTR -T 2720 w=2.4732 (nil) +T 2753 w=2.4732 (nil) Mx 375.0243 T 30 w=6.9984 (nil) Mx 382.0227 @@ -197,11 +197,11 @@ T 862 w=7.0704 (nil) Mx 397.7343 My 73.2817 Set font Libertinus Math;10.8;400;Regular;normal;;;LTR -T 2720 w=2.4732 (nil) +T 2753 w=2.4732 (nil) Mx 400.2075 T 13 w=2.3760 (nil) Mx 402.5835 -T 2721 w=3.2918 (nil) +T 2754 w=3.2918 (nil) Mx 412.3326 My 77.5693 Set font Libertinus Math;18;400;Regular;normal;;;LTR @@ -227,32 +227,32 @@ T 29 w=2.2900 (:) Mx 254.0087 My 110.1369 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 251.4587 My 122.0169 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 10.3800 -T 3774 a=11.3800 (nil) +T 4096 a=11.3800 (nil) Mx 251.4271 My 132.8409 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2721 w=2.5392 (nil) +T 2754 w=2.5392 (nil) Mx 253.9663 T 30 w=5.1840 (nil) Mx 259.1503 T 17 w=3.7200 (nil) Mx 268.4870 My 110.0919 -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 264.5370 My 122.0319 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 13.1800 -T 3666 a=14.1800 (nil) +T 3986 a=14.1800 (nil) Mx 265.3086 My 132.8219 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 269.0414 T 30 w=5.1840 (nil) Mx 274.2254 @@ -264,11 +264,11 @@ Mx 281.4582 My 122.0219 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 10.6300 -T 3665 a=12.4300 (nil) +T 3985 a=12.4300 (nil) Mx 280.3836 My 132.6619 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2724 w=5.6752 (nil) +T 2757 w=5.6752 (nil) Mx 286.0588 T 30 w=5.1840 (nil) Mx 291.2428 @@ -284,11 +284,11 @@ T 78 w=4.7400 (nil) Mx 301.0995 My 118.0549 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2060 w=6.7760 (nil) +T 2087 w=6.7760 (nil) Mx 307.8755 My 120.2789 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 309.2495 T 30 w=3.8880 (nil) Mx 313.1375 @@ -300,11 +300,11 @@ T 862 w=3.9280 (nil) Mx 321.8662 My 119.7349 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 323.2402 T 13 w=1.3200 (nil) Mx 324.5602 -T 2721 w=1.8288 (nil) +T 2754 w=1.8288 (nil) Mx 329.9407 My 122.1169 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -338,32 +338,32 @@ T 29 w=2.2900 (:) Mx 219.1054 My 171.2807 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2073 w=11.3040 (nil) +T 2100 w=11.3040 (nil) Mx 214.5154 My 192.6647 Set font Libertinus Math;18;400;Regular;normal;;;LTR Mx 18.6840 -T 3774 a=20.4840 (nil) +T 4096 a=20.4840 (nil) Mx 214.4585 My 212.1479 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2721 w=4.5706 (nil) +T 2754 w=4.5706 (nil) Mx 219.0291 T 30 w=9.3312 (nil) Mx 228.3603 T 17 w=6.6960 (nil) Mx 245.1663 My 171.1997 -T 2073 w=11.3040 (nil) +T 2100 w=11.3040 (nil) Mx 238.0563 My 192.6917 Set font Libertinus Math;18;400;Regular;normal;;;LTR Mx 23.7240 -T 3666 a=25.5240 (nil) +T 3986 a=25.5240 (nil) Mx 239.4452 My 212.1137 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2725 w=6.7190 (nil) +T 2758 w=6.7190 (nil) Mx 246.1642 T 30 w=9.3312 (nil) Mx 255.4954 @@ -375,11 +375,11 @@ Mx 268.5146 My 192.6737 Set font Libertinus Math;18;400;Regular;normal;;;LTR Mx 19.1340 -T 3665 a=22.3740 (nil) +T 3985 a=22.3740 (nil) Mx 266.5803 My 211.8257 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2724 w=10.2154 (nil) +T 2757 w=10.2154 (nil) Mx 276.7956 T 30 w=9.3312 (nil) Mx 286.1268 @@ -395,11 +395,11 @@ T 78 w=8.5320 (nil) Mx 303.8688 My 185.5331 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2060 w=12.1968 (nil) +T 2087 w=12.1968 (nil) Mx 316.0656 My 189.5363 Set font Libertinus Math;10.8;400;Regular;normal;;;LTR -T 2720 w=2.4732 (nil) +T 2753 w=2.4732 (nil) Mx 318.5388 T 30 w=6.9984 (nil) Mx 325.5372 @@ -411,11 +411,11 @@ T 862 w=7.0704 (nil) Mx 341.2488 My 188.5571 Set font Libertinus Math;10.8;400;Regular;normal;;;LTR -T 2720 w=2.4732 (nil) +T 2753 w=2.4732 (nil) Mx 343.7220 T 13 w=2.3760 (nil) Mx 346.0980 -T 2721 w=3.2918 (nil) +T 2754 w=3.2918 (nil) Mx 355.7831 My 192.8447 Set font Libertinus Math;18;400;Regular;normal;;;LTR @@ -441,45 +441,45 @@ T 29 w=2.2900 (:) Mx 161.2719 My 230.7047 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 153.0219 My 235.7947 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2223 w=8.2500 (nil) +T 2250 w=8.2500 (nil) Mx 161.2719 My 238.6047 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2721 w=2.5392 (nil) +T 2754 w=2.5392 (nil) Mx 163.8111 T 30 w=5.1840 (nil) Mx 168.9951 T 17 w=3.7200 (nil) Mx 184.8318 My 230.7047 -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 174.8118 My 235.7947 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2058 w=10.0200 (nil) +T 2085 w=10.0200 (nil) Mx 184.8318 My 238.6047 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 188.5646 T 30 w=5.1840 (nil) Mx 193.7486 T 17 w=3.7200 (nil) Mx 208.0352 My 230.7547 -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 199.5652 My 235.7947 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2060 w=8.4700 (nil) +T 2087 w=8.4700 (nil) Mx 208.0352 My 238.5747 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2724 w=5.6752 (nil) +T 2757 w=5.6752 (nil) Mx 213.7104 T 30 w=5.1840 (nil) Mx 218.8944 @@ -491,15 +491,15 @@ T 70 w=4.4700 (nil) Mx 235.9571 My 227.7007 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2724 w=4.2288 (nil) +T 2757 w=4.2288 (nil) Mx 229.1811 My 231.7327 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2060 w=6.7760 (nil) +T 2087 w=6.7760 (nil) Mx 235.9571 My 233.9567 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 237.3311 T 30 w=3.8880 (nil) Mx 241.2191 @@ -511,11 +511,11 @@ T 862 w=3.9280 (nil) Mx 249.9478 My 233.4127 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 251.3218 T 13 w=1.3200 (nil) Mx 252.6418 -T 2721 w=1.8288 (nil) +T 2754 w=1.8288 (nil) Mx 258.1039 My 235.7947 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -541,48 +541,48 @@ T 29 w=2.2900 (:) Mx 254.0087 My 264.8535 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 251.4587 My 276.7335 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 10.3800 -T 3774 a=11.3800 (nil) +T 4096 a=11.3800 (nil) Mx 251.4271 My 287.5575 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2721 w=2.5392 (nil) +T 2754 w=2.5392 (nil) Mx 253.9663 T 30 w=5.1840 (nil) Mx 259.1503 T 17 w=3.7200 (nil) Mx 268.4870 My 264.8085 -T 2073 w=6.2800 (nil) +T 2100 w=6.2800 (nil) Mx 264.5370 My 276.7485 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 13.1800 -T 3666 a=14.1800 (nil) +T 3986 a=14.1800 (nil) Mx 265.3086 My 287.5385 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 269.0414 T 30 w=5.1840 (nil) Mx 274.2254 T 17 w=3.7200 (nil) Mx 285.8068 My 264.9685 -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 281.4582 My 276.7385 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 10.6300 -T 3665 a=12.4300 (nil) +T 3985 a=12.4300 (nil) Mx 280.3836 My 287.3785 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2724 w=5.6752 (nil) +T 2757 w=5.6752 (nil) Mx 286.0588 T 30 w=5.1840 (nil) Mx 291.2428 @@ -594,15 +594,15 @@ T 70 w=4.4700 (nil) Mx 307.8755 My 268.7395 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2724 w=4.2288 (nil) +T 2757 w=4.2288 (nil) Mx 301.0995 My 272.7715 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2060 w=6.7760 (nil) +T 2087 w=6.7760 (nil) Mx 307.8755 My 274.9955 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 309.2495 T 30 w=3.8880 (nil) Mx 313.1375 @@ -614,11 +614,11 @@ T 862 w=3.9280 (nil) Mx 321.8662 My 274.4515 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2720 w=1.3740 (nil) +T 2753 w=1.3740 (nil) Mx 323.2402 T 13 w=1.3200 (nil) Mx 324.5602 -T 2721 w=1.8288 (nil) +T 2754 w=1.8288 (nil) Mx 329.9407 My 276.8335 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -631,176 +631,176 @@ Set font Gentium Plus;10;400;;normal;;;LTR T 44 81 87 72 74 85 68 79 86 w=36.5576 (Integrals) Mx 86.3214 T 15 w=2.2900 (,) -Mx 91.2855 +Mx 91.2853 T 87 72 91 87 w=16.5332 (text) -Mx 107.8187 +Mx 107.8186 T 15 w=2.2900 (,) -Mx 112.7828 +Mx 112.7825 T 48 68 87 75 48 47 w=34.4336 (MathML) -Mx 147.2164 +Mx 147.2161 T 29 w=2.2900 (:) -Mx 152.1805 +Mx 152.1801 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2090 w=8.9000 (nil) -Mx 158.0805 +T 2117 w=7.4000 (nil) +Mx 159.5801 My 312.2195 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2705 w=3.7616 (nil) -Mx 162.2721 +T 2738 w=3.7616 (nil) +Mx 163.7717 My 308.8795 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2639 w=5.6200 (nil) -Mx 170.1462 -T 2227 w=2.0800 (nil) -Mx 174.4802 -T 2664 2653 w=10.0200 (nil) -Mx 187.3574 +T 2672 w=5.6200 (nil) +Mx 171.6455 +T 2254 w=2.0800 (nil) +Mx 175.9793 +T 2697 2686 w=10.0200 (nil) +Mx 188.8562 T 30 w=6.4800 (nil) -Draw line 196.6947 305.9545 6.3100 0.6500 -Mx 197.9897 +Draw line 198.1930 305.9545 6.3100 0.6500 +Mx 199.4880 My 304.0795 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 18 w=3.7200 (nil) -Mx 196.6947 +Mx 198.1930 My 313.6795 T 863 w=3.1760 (nil) -Mx 199.8707 +Mx 201.3690 My 315.3595 Set font Libertinus Math;6;400;Regular;normal;;;LTR T 17 w=2.7900 (nil) -Mx 203.0047 +Mx 204.5030 My 308.8795 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2088 w=11.2500 (nil) -Mx 211.2547 +T 2115 w=11.2500 (nil) +Mx 212.7530 My 312.2195 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2708 w=5.0112 (nil) -Mx 216.6959 +T 2741 w=5.0112 (nil) +Mx 218.1942 My 308.8795 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 875 w=5.2500 (nil) -Mx 221.9459 +Mx 223.4442 T 69 55 w=11.5800 (nil) -Mx 236.3831 +Mx 237.8810 T 30 w=6.4800 (nil) -Mx 245.7203 -T 2086 w=6.4500 (nil) -Mx 249.1703 +Mx 247.2179 +T 2113 w=6.4500 (nil) +Mx 250.6679 My 312.2195 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 250.6703 +Mx 252.1679 My 303.0795 -T 2735 w=4.1984 (nil) -Mx 255.2987 +T 2768 w=4.1984 (nil) +Mx 256.7963 My 308.8795 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2718 w=5.8900 (nil) -Mx 261.1887 +T 2751 w=5.8900 (nil) +Mx 262.6863 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 264.7487 -T 2731 w=3.0300 (nil) -Mx 267.7787 +Mx 266.2463 +T 2764 w=3.0300 (nil) +Mx 269.2763 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 271.3387 +Mx 272.8363 T 69 w=5.0600 (nil) -Mx 276.3987 -T 2731 w=3.0300 (nil) +Mx 277.8963 +T 2764 w=3.0300 (nil) Mx 49.7638 My 333.8147 Set font Gentium Plus;10;400;;normal;;;LTR T 44 81 87 72 74 85 68 79 86 w=36.5576 (Integrals) Mx 86.3214 T 15 w=2.2900 (,) -Mx 91.2686 +Mx 91.2683 T 87 72 91 87 w=16.5332 (text) -Mx 110.4590 +Mx 110.4584 T 11 w=3.1689 (() -Mx 113.6279 +Mx 113.6273 T 79 68 85 74 72 w=20.7568 (large) -Mx 137.0419 +Mx 137.0410 T 73 82 81 87 w=17.0996 (font) -Mx 154.1415 +Mx 154.1407 T 12 w=3.1689 ()) -Mx 157.3105 +Mx 157.3096 T 15 w=2.2900 (,) -Mx 162.2577 +Mx 162.2565 T 48 68 87 75 48 47 w=34.4336 (MathML) -Mx 196.6913 +Mx 196.6901 T 29 w=2.2900 (:) -Mx 204.2957 +Mx 204.2939 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2090 w=16.0200 (nil) -Mx 214.9157 +T 2117 w=13.3200 (nil) +Mx 217.6139 My 339.8267 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2705 w=6.7709 (nil) -Mx 222.4606 +T 2738 w=6.7709 (nil) +Mx 225.1588 My 333.8147 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2639 w=10.1160 (nil) -Mx 236.6031 -T 2227 w=3.7440 (nil) -Mx 244.3736 -T 2664 2653 w=18.0360 (nil) -Mx 267.4758 +T 2672 w=10.1160 (nil) +Mx 239.3007 +T 2254 w=3.7440 (nil) +Mx 247.0707 +T 2697 2686 w=18.0360 (nil) +Mx 270.1716 T 30 w=11.6640 (nil) -Draw line 284.2061 328.5497 11.3580 1.1700 -Mx 286.5371 +Draw line 286.9006 328.5497 11.3580 1.1700 +Mx 289.2316 My 325.1747 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR T 18 w=6.6960 (nil) -Mx 284.2061 +Mx 286.9006 My 342.4547 T 863 w=5.7168 (nil) -Mx 289.9229 +Mx 292.6174 My 345.4787 Set font Libertinus Math;10.8;400;Regular;normal;;;LTR T 17 w=5.0220 (nil) -Mx 295.5641 +Mx 298.2586 My 333.8147 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2088 w=20.2500 (nil) -Mx 310.4141 +T 2115 w=20.2500 (nil) +Mx 313.1086 My 339.8267 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2708 w=9.0202 (nil) -Mx 320.2083 +T 2741 w=9.0202 (nil) +Mx 322.9027 My 333.8147 Set font Libertinus Math;18;400;Regular;normal;;;LTR T 875 w=9.4500 (nil) -Mx 329.6583 +Mx 332.3527 T 69 55 w=20.8440 (nil) -Mx 355.5685 +Mx 358.2616 T 30 w=11.6640 (nil) -Mx 372.2988 -T 2086 w=11.6100 (nil) -Mx 378.5088 +Mx 374.9906 +T 2113 w=11.6100 (nil) +Mx 381.2006 My 339.8267 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR T 17 w=6.6960 (nil) -Mx 381.2088 +Mx 383.9006 My 323.3747 -T 2735 w=7.5571 (nil) -Mx 389.5399 +T 2768 w=7.5571 (nil) +Mx 392.2317 My 333.8147 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2718 w=10.6020 (nil) -Mx 400.1419 +T 2751 w=10.6020 (nil) +Mx 402.8337 Mx 5.0760 T 9 a=6.4080 (nil) -Mx 406.5499 -T 2731 w=5.4540 (nil) -Mx 412.0039 +Mx 409.2417 +T 2764 w=5.4540 (nil) +Mx 414.6957 Mx 5.0760 T 10 a=6.4080 (nil) -Mx 418.4119 +Mx 421.1037 T 69 w=9.1080 (nil) -Mx 427.5199 -T 2731 w=5.4540 (nil) +Mx 430.2117 +T 2764 w=5.4540 (nil) Mx 49.7638 My 354.1551 Set font Gentium Plus;10;400;;normal;;;LTR @@ -815,79 +815,79 @@ Mx 125.5772 T 48 68 87 75 48 47 w=34.4336 (MathML) Mx 160.0108 T 29 w=2.2900 (:) -Mx 229.1244 +Mx 229.6294 My 381.4105 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 9.7200 -T 3908 a=10.3700 (nil) -Mx 237.6944 +T 4231 a=10.7600 (nil) +Mx 237.8894 My 390.1805 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2705 w=3.7616 (nil) -Mx 241.8860 +T 2738 w=3.7616 (nil) +Mx 242.0810 My 381.4105 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2639 w=5.6200 (nil) -Mx 249.7282 -T 2227 w=2.0800 (nil) -Mx 254.0305 -T 2664 2653 w=10.0200 (nil) -Mx 266.8282 +T 2672 w=5.6200 (nil) +Mx 249.9232 +T 2254 w=2.0800 (nil) +Mx 254.2255 +T 2697 2686 w=10.0200 (nil) +Mx 267.0232 T 30 w=6.4800 (nil) -Draw line 276.0860 378.4855 8.1200 0.6500 -Mx 277.8210 +Draw line 276.2810 378.4855 8.1200 0.6500 +Mx 278.0160 My 375.6105 T 18 w=4.6500 (nil) -Mx 276.0860 +Mx 276.2810 My 388.4105 T 863 w=3.9700 (nil) -Mx 280.0560 +Mx 280.2510 My 390.5105 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 284.2060 +Mx 284.4010 My 381.4105 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 12.1800 -T 3663 a=13.7400 (nil) -Mx 296.1460 +T 3983 a=13.7400 (nil) +Mx 295.6410 My 390.1805 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2708 w=5.0112 (nil) -Mx 301.5872 +T 2741 w=5.0112 (nil) +Mx 301.0822 My 381.4105 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 875 w=5.2500 (nil) -Mx 306.8372 +Mx 306.3322 T 69 55 w=11.5800 (nil) -Mx 321.1950 +Mx 320.6900 T 30 w=6.4800 (nil) -Mx 330.4528 +Mx 329.9478 Mx 5.3800 -T 3661 a=6.9400 (nil) -Mx 335.5928 +T 3981 a=6.9400 (nil) +Mx 334.3878 My 390.1805 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 337.3928 +Mx 336.8878 My 370.1905 -T 2735 w=4.1984 (nil) -Mx 342.0212 +T 2768 w=4.1984 (nil) +Mx 341.5162 My 381.4105 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2718 w=5.8900 (nil) -Mx 347.9112 +T 2751 w=5.8900 (nil) +Mx 347.4062 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 351.4712 -T 2731 w=3.0300 (nil) -Mx 354.5012 +Mx 350.9662 +T 2764 w=3.0300 (nil) +Mx 353.9962 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 358.0612 +Mx 357.5562 T 69 w=5.0600 (nil) -Mx 363.1212 -T 2731 w=3.0300 (nil) +Mx 362.6162 +T 2764 w=3.0300 (nil) Mx 49.7638 My 408.4850 Set font Gentium Plus;10;400;;normal;;;LTR @@ -910,163 +910,163 @@ Mx 175.1236 T 48 68 87 75 48 47 w=34.4336 (MathML) Mx 209.5572 T 29 w=2.2900 (:) -Mx 174.3137 +Mx 175.2227 My 447.5261 Set font Libertinus Math;18;400;Regular;normal;;;LTR Mx 17.4960 -T 3908 a=18.6660 (nil) -Mx 189.7397 +T 4231 a=19.3680 (nil) +Mx 190.0907 My 463.3121 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2705 w=6.7709 (nil) -Mx 197.2846 +T 2738 w=6.7709 (nil) +Mx 197.6356 My 447.5261 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2639 w=10.1160 (nil) -Mx 211.4006 -T 2227 w=3.7440 (nil) -Mx 219.1446 -T 2664 2653 w=18.0360 (nil) -Mx 242.1806 +T 2672 w=10.1160 (nil) +Mx 211.7516 +T 2254 w=3.7440 (nil) +Mx 219.4956 +T 2697 2686 w=18.0360 (nil) +Mx 242.5316 T 30 w=11.6640 (nil) -Draw line 258.8446 442.2611 14.6160 1.1700 -Mx 261.9676 +Draw line 259.1956 442.2611 14.6160 1.1700 +Mx 262.3186 My 437.0861 T 18 w=8.3700 (nil) -Mx 258.8446 +Mx 259.1956 My 460.1261 T 863 w=7.1460 (nil) -Mx 265.9906 +Mx 266.3416 My 463.9061 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR T 17 w=6.6960 (nil) -Mx 273.4606 +Mx 273.8116 My 447.5261 Set font Libertinus Math;18;400;Regular;normal;;;LTR Mx 21.9240 -T 3663 a=24.7320 (nil) -Mx 294.9526 +T 3983 a=24.7320 (nil) +Mx 294.0436 My 463.3121 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2708 w=9.0202 (nil) -Mx 304.7468 +T 2741 w=9.0202 (nil) +Mx 303.8378 My 447.5261 Set font Libertinus Math;18;400;Regular;normal;;;LTR T 875 w=9.4500 (nil) -Mx 314.1968 +Mx 313.2878 T 69 55 w=20.8440 (nil) -Mx 340.0408 +Mx 339.1318 T 30 w=11.6640 (nil) -Mx 356.7048 +Mx 355.7958 Mx 9.6840 -T 3661 a=12.4920 (nil) -Mx 365.9568 +T 3981 a=12.4920 (nil) +Mx 363.7878 My 463.3121 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR T 17 w=6.6960 (nil) -Mx 369.1968 +Mx 368.2878 My 427.3301 -T 2735 w=7.5571 (nil) -Mx 377.5279 +T 2768 w=7.5571 (nil) +Mx 376.6189 My 447.5261 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2718 w=10.6020 (nil) -Mx 388.1299 +T 2751 w=10.6020 (nil) +Mx 387.2209 Mx 5.0760 T 9 a=6.4080 (nil) -Mx 394.5379 -T 2731 w=5.4540 (nil) -Mx 399.9919 +Mx 393.6289 +T 2764 w=5.4540 (nil) +Mx 399.0829 Mx 5.0760 T 10 a=6.4080 (nil) -Mx 406.3999 +Mx 405.4909 T 69 w=9.1080 (nil) -Mx 415.5079 -T 2731 w=5.4540 (nil) +Mx 414.5989 +T 2764 w=5.4540 (nil) Mx 49.7638 My 483.7961 Set font Gentium Plus;10;400;;normal;;;LTR T 44 81 87 72 74 85 68 79 86 w=36.5576 (Integrals) Mx 86.3214 T 15 w=2.2900 (,) -Mx 91.2875 +Mx 91.2873 T 87 72 91 87 w=16.5332 (text) -Mx 107.8207 +Mx 107.8205 T 15 w=2.2900 (,) -Mx 112.7868 +Mx 112.7865 T 55 72 59 w=16.2793 (TeX) -Mx 129.0661 +Mx 129.0658 T 29 w=2.2900 (:) -Mx 134.0322 +Mx 134.0317 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2090 w=8.9000 (nil) -Mx 139.9322 +T 2117 w=7.4000 (nil) +Mx 141.4317 My 487.1361 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2705 w=3.7616 (nil) -Mx 144.1238 +T 2738 w=3.7616 (nil) +Mx 145.6233 My 483.7961 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2639 w=5.6200 (nil) -Mx 151.9999 -T 2227 w=2.0800 (nil) -Mx 156.3359 -T 2664 2653 w=10.0200 (nil) -Mx 169.2182 +T 2672 w=5.6200 (nil) +Mx 153.4992 +T 2254 w=2.0800 (nil) +Mx 157.8351 +T 2697 2686 w=10.0200 (nil) +Mx 170.7169 T 30 w=6.4800 (nil) -Draw line 178.5604 480.8711 6.3100 0.6500 -Mx 179.8554 +Draw line 180.0588 480.8711 6.3100 0.6500 +Mx 181.3538 My 478.9961 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 18 w=3.7200 (nil) -Mx 178.5604 +Mx 180.0588 My 488.5961 T 863 w=3.1760 (nil) -Mx 181.7364 +Mx 183.2348 My 490.2761 Set font Libertinus Math;6;400;Regular;normal;;;LTR T 17 w=2.7900 (nil) -Mx 184.8704 +Mx 186.3688 My 483.7961 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2088 w=11.2500 (nil) -Mx 193.1204 +T 2115 w=11.2500 (nil) +Mx 194.6188 My 487.1361 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2708 w=5.0112 (nil) -Mx 198.5616 +T 2741 w=5.0112 (nil) +Mx 200.0600 My 483.7961 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 875 w=5.2500 (nil) -Mx 203.8116 +Mx 205.3100 T 69 55 w=11.5800 (nil) -Mx 218.2539 +Mx 219.7518 T 30 w=6.4800 (nil) -Mx 227.5962 -T 2086 w=6.4500 (nil) -Mx 231.0462 +Mx 229.0937 +T 2113 w=6.4500 (nil) +Mx 232.5437 My 487.1361 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 232.5462 +Mx 234.0437 My 477.9961 -T 2735 w=4.1984 (nil) -Mx 237.1746 +T 2768 w=4.1984 (nil) +Mx 238.6721 My 483.7961 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2718 w=5.8900 (nil) -Mx 243.0646 +T 2751 w=5.8900 (nil) +Mx 244.5621 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 246.6246 -T 2731 w=3.0300 (nil) -Mx 249.6546 +Mx 248.1221 +T 2764 w=3.0300 (nil) +Mx 251.1521 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 253.2146 +Mx 254.7121 T 69 w=5.0600 (nil) -Mx 258.2746 -T 2731 w=3.0300 (nil) +Mx 259.7721 +T 2764 w=3.0300 (nil) Mx 49.7638 My 498.9045 Set font Gentium Plus;10;400;;normal;;;LTR @@ -1081,79 +1081,79 @@ Mx 125.5812 T 55 72 59 w=16.2793 (TeX) Mx 141.8605 T 29 w=2.2900 (:) -Mx 229.1244 +Mx 229.6294 My 526.1599 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 9.7200 -T 3908 a=10.3700 (nil) -Mx 237.6944 +T 4231 a=10.7600 (nil) +Mx 237.8894 My 534.9299 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2705 w=3.7616 (nil) -Mx 241.8860 +T 2738 w=3.7616 (nil) +Mx 242.0810 My 526.1599 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2639 w=5.6200 (nil) -Mx 249.7282 -T 2227 w=2.0800 (nil) -Mx 254.0305 -T 2664 2653 w=10.0200 (nil) -Mx 266.8282 +T 2672 w=5.6200 (nil) +Mx 249.9232 +T 2254 w=2.0800 (nil) +Mx 254.2255 +T 2697 2686 w=10.0200 (nil) +Mx 267.0232 T 30 w=6.4800 (nil) -Draw line 276.0860 523.2349 8.1200 0.6500 -Mx 277.8210 +Draw line 276.2810 523.2349 8.1200 0.6500 +Mx 278.0160 My 520.3599 T 18 w=4.6500 (nil) -Mx 276.0860 +Mx 276.2810 My 533.1599 T 863 w=3.9700 (nil) -Mx 280.0560 +Mx 280.2510 My 535.2599 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 284.2060 +Mx 284.4010 My 526.1599 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 12.1800 -T 3663 a=13.7400 (nil) -Mx 296.1460 +T 3983 a=13.7400 (nil) +Mx 295.6410 My 534.9299 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2708 w=5.0112 (nil) -Mx 301.5872 +T 2741 w=5.0112 (nil) +Mx 301.0822 My 526.1599 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 875 w=5.2500 (nil) -Mx 306.8372 +Mx 306.3322 T 69 55 w=11.5800 (nil) -Mx 321.1950 +Mx 320.6900 T 30 w=6.4800 (nil) -Mx 330.4528 +Mx 329.9478 Mx 5.3800 -T 3661 a=6.9400 (nil) -Mx 335.5928 +T 3981 a=6.9400 (nil) +Mx 334.3878 My 534.9299 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 337.3928 +Mx 336.8878 My 514.9399 -T 2735 w=4.1984 (nil) -Mx 342.0212 +T 2768 w=4.1984 (nil) +Mx 341.5162 My 526.1599 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2718 w=5.8900 (nil) -Mx 347.9112 +T 2751 w=5.8900 (nil) +Mx 347.4062 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 351.4712 -T 2731 w=3.0300 (nil) -Mx 354.5012 +Mx 350.9662 +T 2764 w=3.0300 (nil) +Mx 353.9962 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 358.0612 +Mx 357.5562 T 69 w=5.0600 (nil) -Mx 363.1212 -T 2731 w=3.0300 (nil) +Mx 362.6162 +T 2764 w=3.0300 (nil) Mx 295.2916 My 780.6177 Set font Gentium Plus;10;400;;normal;;;LTR diff --git a/tests/math-fractions.expected b/tests/math-fractions.expected index c018e5ff9..dc85a7be5 100644 --- a/tests/math-fractions.expected +++ b/tests/math-fractions.expected @@ -53,7 +53,7 @@ T 21 w=2.7900 (nil) Mx 178.9602 T 12 w=3.8880 (nil) Mx 182.8482 -T 2260 w=4.5420 (nil) +T 2287 w=4.5420 (nil) Mx 189.6528 My 51.7585 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -119,7 +119,7 @@ T 21 w=2.7900 (nil) Mx 302.6088 T 12 w=3.8880 (nil) Mx 306.4968 -T 2260 w=4.5420 (nil) +T 2287 w=4.5420 (nil) Mx 313.2610 My 104.3563 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -183,7 +183,7 @@ T 21 w=2.7900 (nil) Mx 160.8119 T 12 w=3.8880 (nil) Mx 164.6999 -T 2260 w=4.5420 (nil) +T 2287 w=4.5420 (nil) Mx 171.5065 My 147.5443 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -249,7 +249,7 @@ T 21 w=2.7900 (nil) Mx 302.6088 T 12 w=3.8880 (nil) Mx 306.4968 -T 2260 w=4.5420 (nil) +T 2287 w=4.5420 (nil) Mx 313.2610 My 200.1421 Set font Libertinus Math;10;400;Regular;normal;;;LTR @@ -264,7 +264,7 @@ Draw line 49.7638 240.4851 10.7360 0.6500 Mx 49.7638 My 238.6101 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 51.5958 T 12 w=5.1840 (nil) Mx 56.7798 @@ -272,7 +272,7 @@ T 18 w=3.7200 (nil) Draw line 60.4998 240.4851 10.7360 0.6500 Mx 60.4998 My 248.2101 -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 62.3318 T 12 w=5.1840 (nil) Mx 67.5158 diff --git a/tests/math-macros.expected b/tests/math-macros.expected index 7e2690e3d..4cd2d2472 100644 --- a/tests/math-macros.expected +++ b/tests/math-macros.expected @@ -11,7 +11,7 @@ T 9 w=2.8480 (nil) Mx 256.5952 T 19 w=3.7200 (nil) Mx 260.3152 -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 264.0480 T 12 w=5.1840 (nil) Mx 269.2320 @@ -22,109 +22,109 @@ Mx 276.2300 My 51.6845 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 3.0000 -T 3653 a=4.2100 (nil) +T 3798 a=4.2100 (nil) Mx 280.4400 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 285.8500 Mx 2.9900 -T 3654 a=4.2100 (nil) +T 3799 a=4.2100 (nil) Mx 292.8378 T 30 w=6.4800 (nil) Mx 302.0956 T 9 w=3.5600 (nil) Mx 305.6556 -T 2061 18 w=11.1300 (nil) +T 2088 18 w=11.1300 (nil) Mx 316.7856 T 10 w=3.5600 (nil) Mx 320.3456 My 47.9345 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) +T 2758 w=3.7328 (nil) Mx 326.5084 My 51.6845 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 68 80 84 w=13.2200 (nil) Mx 339.7284 Mx 3.0000 -T 3653 a=4.2100 (nil) +T 3798 a=4.2100 (nil) Mx 343.9384 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 349.3484 Mx 2.9900 -T 3654 a=4.2100 (nil) +T 3799 a=4.2100 (nil) Draw line 275.3007 84.0086 11.3900 0.6500 Mx 275.3007 My 79.6886 T 69 w=5.0600 (nil) Mx 280.3607 -T 2779 w=6.3300 (nil) +T 2812 w=6.3300 (nil) Mx 276.9507 My 93.9336 T 69 w=5.0600 (nil) Mx 282.0107 -T 2731 w=3.0300 (nil) +T 2764 w=3.0300 (nil) Mx 289.4685 My 86.9336 T 30 w=6.4800 (nil) Mx 298.7262 My 86.8386 Mx 10.6300 -T 3665 a=12.4300 (nil) +T 3985 a=12.4300 (nil) Mx 304.0252 My 97.5426 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) +T 2753 w=1.8320 (nil) Mx 312.8229 My 86.9336 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2743 w=6.0300 (nil) +T 2776 w=6.0300 (nil) Mx 317.7129 My 89.0336 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2720 w=1.8320 (nil) -Mx 261.3836 +T 2753 w=1.8320 (nil) +Mx 260.6986 My 124.0866 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 2.8200 T 9 a=3.5600 (nil) -Mx 264.9436 +Mx 264.2586 T 877 w=5.7000 (nil) -Mx 270.6436 +Mx 269.9586 My 126.1866 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 274.7936 +Mx 274.1086 My 124.0866 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 278.6603 +Mx 277.9753 T 877 w=5.7000 (nil) -Mx 284.3603 +Mx 283.6753 My 126.1866 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 18 w=3.7200 (nil) -Mx 288.5103 +Mx 287.8253 My 124.0866 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 292.3770 +Mx 291.6920 T 1769 w=7.4900 (nil) -Mx 299.8670 +Mx 299.1820 T 13 w=2.2000 (nil) -Mx 303.7336 +Mx 303.0486 T 877 w=5.7000 (nil) -Mx 309.4336 +Mx 308.7486 My 126.1866 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 313.5964 +T 2758 w=3.7328 (nil) +Mx 312.9114 My 124.0866 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 2.8200 T 10 a=3.5600 (nil) -Mx 319.9342 -T 2051 w=5.0000 (nil) -Mx 327.7120 +Mx 319.2492 +T 2078 w=6.3700 (nil) +Mx 328.3970 T 1887 w=6.1800 (nil) Mx 295.2916 My 780.6177 diff --git a/tests/math-ops.expected b/tests/math-ops.expected index 8e9a13105..0017447e3 100644 --- a/tests/math-ops.expected +++ b/tests/math-ops.expected @@ -13,110 +13,110 @@ T 29 w=2.2900 (:) Mx 186.7988 My 57.1446 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 194.9866 T 30 w=6.4800 (nil) Mx 201.4666 T 29 w=6.4800 (nil) Mx 210.7243 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 215.2643 T 13 w=2.2000 (nil) Mx 219.1310 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 226.2488 T 31 w=6.4800 (nil) Mx 186.7988 My 87.3087 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 194.9866 T 30 w=6.4800 (nil) Mx 201.4666 T 29 w=6.4800 (nil) Mx 210.7243 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 215.2643 T 13 w=2.2000 (nil) Mx 219.1310 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 226.2488 T 31 w=6.4800 (nil) Mx 188.1877 My 117.4728 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 196.3754 T 30 w=6.4800 (nil) Mx 205.6332 T 29 w=6.4800 (nil) Mx 212.1132 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 216.6532 T 13 w=2.2000 (nil) Mx 220.5199 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 224.8599 T 31 w=6.4800 (nil) Mx 188.1877 My 147.6368 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 196.3754 T 30 w=6.4800 (nil) Mx 205.6332 T 29 w=6.4800 (nil) Mx 212.1132 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 216.6532 T 13 w=2.2000 (nil) Mx 220.5199 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 224.8599 T 31 w=6.4800 (nil) Mx 191.6260 My 177.8009 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 199.8138 T 30 w=6.4800 (nil) Mx 209.0716 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 213.6116 -T 2726 w=4.2700 (nil) +T 2759 w=4.2700 (nil) Mx 217.8816 -T 2727 w=5.6800 (nil) +T 2760 w=5.6800 (nil) Mx 223.5616 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 191.4860 My 207.9650 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 199.6738 T 30 w=6.4800 (nil) Mx 208.9316 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 213.4716 T 80 81 w=10.2300 (nil) Mx 223.7016 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 189.2638 My 238.1290 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 197.4516 T 30 w=6.4800 (nil) Mx 206.7093 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 213.4716 T 80 81 w=10.2300 (nil) Mx 225.9238 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 189.2638 My 268.2931 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 197.4516 T 30 w=6.4800 (nil) Mx 206.7093 -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 213.4716 T 80 81 w=10.2300 (nil) Mx 225.9238 -T 2714 w=4.3400 (nil) +T 2747 w=4.3400 (nil) Mx 40.9764 My 289.3751 Set font Gentium Plus;10;400;;normal;;;LTR @@ -175,7 +175,7 @@ Mx 173.4499 My 400.9493 T 21 19 w=9.3000 (nil) Mx 185.5277 -T 2138 w=6.4800 (nil) +T 2165 w=6.4800 (nil) Mx 194.7854 T 26 w=4.6500 (nil) Mx 209.4354 diff --git a/tests/math-spaces.expected b/tests/math-spaces.expected index 271f48804..a7fe5faa6 100644 --- a/tests/math-spaces.expected +++ b/tests/math-spaces.expected @@ -75,7 +75,7 @@ T 29 w=2.2900 (:) Mx 49.7638 My 121.6628 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 54.3638 My 123.7628 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -175,7 +175,7 @@ T 29 w=2.2900 (:) Mx 49.7638 My 213.4152 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 54.3638 My 215.5152 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -217,7 +217,7 @@ T 86 76 93 72 w=15.4346 (size) Mx 49.7638 My 243.8416 Set font Libertinus Math;6;400;Regular;normal;;;LTR -T 2735 w=3.2460 (nil) +T 2768 w=3.2460 (nil) Mx 52.5238 My 245.1016 Set font Libertinus Math;4.8;400;Regular;normal;;;LTR @@ -259,7 +259,7 @@ T 70 79 69 w=5.3820 (nil) Mx 49.7638 My 255.8540 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2735 w=9.7380 (nil) +T 2768 w=9.7380 (nil) Mx 58.0438 My 259.6340 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR diff --git a/tests/math-stretchy.expected b/tests/math-stretchy.expected index c0cff92de..5e82045de 100644 --- a/tests/math-stretchy.expected +++ b/tests/math-stretchy.expected @@ -21,7 +21,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 830 w=4.9700 (nil) Mx 208.2223 Mx 3.3500 -T 3657 a=4.6500 (nil) +T 3802 a=4.6500 (nil) Draw line 212.8723 50.1605 3.7200 0.6500 Mx 212.9683 My 47.6785 @@ -34,11 +34,11 @@ Mx 216.5923 My 53.0855 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 3.3200 -T 3658 a=4.6500 (nil) +T 3803 a=4.6500 (nil) Mx 223.4974 T 12 w=6.4800 (nil) Mx 232.2325 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 237.6425 My 49.9855 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -48,7 +48,7 @@ My 53.0855 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 9 w=3.5600 (nil) Mx 245.3525 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 253.0175 T 12 w=6.4800 (nil) Mx 261.7526 @@ -77,7 +77,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 830 w=4.9700 (nil) Mx 268.5334 Mx 3.6700 -T 3811 a=4.9700 (nil) +T 4133 a=4.9700 (nil) Draw line 273.5034 90.2433 4.6500 0.6500 Mx 273.6234 My 85.9733 @@ -88,11 +88,11 @@ T 19 w=4.6500 (nil) Mx 278.1534 My 93.1683 Mx 3.6700 -T 3819 a=4.9700 (nil) +T 4141 a=4.9700 (nil) Mx 285.3456 T 12 w=6.4800 (nil) Mx 294.0478 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 299.4578 My 89.4183 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -102,7 +102,7 @@ My 93.1683 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 9 w=3.5600 (nil) Mx 307.1678 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 314.8000 T 12 w=6.4800 (nil) Mx 323.5022 @@ -130,7 +130,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 830 w=4.9700 (nil) Mx 190.0760 Mx 3.3500 -T 3657 a=4.6500 (nil) +T 3802 a=4.6500 (nil) Draw line 194.7260 118.3363 3.7200 0.6500 Mx 194.8220 My 115.8543 @@ -143,11 +143,11 @@ Mx 198.4460 My 121.2613 Set font Libertinus Math;10;400;Regular;normal;;;LTR Mx 3.3200 -T 3658 a=4.6500 (nil) +T 3803 a=4.6500 (nil) Mx 205.3531 T 12 w=6.4800 (nil) Mx 214.0902 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 219.5002 My 118.1613 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -157,7 +157,7 @@ My 121.2613 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 9 w=3.5600 (nil) Mx 227.2102 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 234.8773 T 12 w=6.4800 (nil) Mx 243.6143 @@ -186,7 +186,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 830 w=4.9700 (nil) Mx 268.5334 Mx 3.6700 -T 3811 a=4.9700 (nil) +T 4133 a=4.9700 (nil) Draw line 273.5034 158.4191 4.6500 0.6500 Mx 273.6234 My 154.1491 @@ -197,11 +197,11 @@ T 19 w=4.6500 (nil) Mx 278.1534 My 161.3441 Mx 3.6700 -T 3819 a=4.9700 (nil) +T 4141 a=4.9700 (nil) Mx 285.3456 T 12 w=6.4800 (nil) Mx 294.0478 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 299.4578 My 157.5941 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -211,7 +211,7 @@ My 161.3441 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 9 w=3.5600 (nil) Mx 307.1678 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 314.8000 T 12 w=6.4800 (nil) Mx 323.5022 diff --git a/tests/math-subsup.expected b/tests/math-subsup.expected index 0ca2d8db7..dac780dd4 100644 --- a/tests/math-subsup.expected +++ b/tests/math-subsup.expected @@ -20,17 +20,17 @@ Mx 179.7128 T 29 w=2.2900 (:) Mx 184.6801 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 189.2201 My 47.6905 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2735 w=4.1984 (nil) +T 2768 w=4.1984 (nil) Mx 196.1056 My 50.7905 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) Mx 204.8427 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 209.4427 My 52.8905 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -38,7 +38,7 @@ T 19 w=3.7200 (nil) Mx 215.8498 My 50.7905 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 224.5870 T 864 w=4.4100 (nil) Mx 228.9970 @@ -82,17 +82,17 @@ T 29 w=2.2900 (:) Mx 264.3758 My 84.0099 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 268.9158 My 80.2599 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2735 w=4.1984 (nil) +T 2768 w=4.1984 (nil) Mx 275.7664 My 84.0099 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) Mx 284.4687 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 289.0687 My 86.1099 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -100,7 +100,7 @@ T 19 w=3.7200 (nil) Mx 295.4409 My 84.0099 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 304.1431 T 864 w=4.4100 (nil) Mx 308.5531 @@ -143,17 +143,17 @@ Mx 161.5626 T 29 w=2.2900 (:) Mx 166.5318 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 171.0718 My 102.3480 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2735 w=4.1984 (nil) +T 2768 w=4.1984 (nil) Mx 177.9594 My 105.4480 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) Mx 186.6986 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 191.2986 My 107.5480 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -161,7 +161,7 @@ T 19 w=3.7200 (nil) Mx 197.7078 My 105.4480 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 206.4469 T 864 w=4.4100 (nil) Mx 210.8569 @@ -183,7 +183,7 @@ T 18 21 w=7.4400 (nil) Mx 226.7436 My 105.4480 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2689 w=6.2100 (nil) +T 2722 w=6.2100 (nil) Mx 49.7638 My 117.4480 Set font Gentium Plus;10;400;;normal;;;LTR @@ -205,17 +205,17 @@ T 29 w=2.2900 (:) Mx 264.5008 My 138.5697 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2713 w=4.5400 (nil) +T 2746 w=4.5400 (nil) Mx 269.0408 My 134.8197 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2735 w=4.1984 (nil) +T 2768 w=4.1984 (nil) Mx 275.8914 My 138.5697 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) Mx 284.5937 -T 2735 w=5.4100 (nil) +T 2768 w=5.4100 (nil) Mx 289.1937 My 140.6697 Set font Libertinus Math;8;400;Regular;normal;;;LTR @@ -223,7 +223,7 @@ T 19 w=3.7200 (nil) Mx 295.5659 My 138.5697 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2061 w=6.4800 (nil) +T 2088 w=6.4800 (nil) Mx 304.2681 T 864 w=4.4100 (nil) Mx 308.6781 @@ -245,7 +245,7 @@ T 18 21 w=7.4400 (nil) Mx 324.5648 My 138.5697 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2689 w=6.2100 (nil) +T 2722 w=6.2100 (nil) Mx 295.2916 My 780.6177 Set font Gentium Plus;10;400;;normal;;;LTR diff --git a/tests/math-tables-mathml.expected b/tests/math-tables-mathml.expected index 5b3620c27..a9b842829 100644 --- a/tests/math-tables-mathml.expected +++ b/tests/math-tables-mathml.expected @@ -77,95 +77,95 @@ T 19 w=4.6500 (nil) Mx 305.9628 T 18 w=4.6500 (nil) Mx 49.7638 -My 160.7013 +My 160.8513 Set font Gentium Plus;10;400;;normal;;;LTR T 41 82 85 80 88 79 68 86 w=38.2617 (Formulas) Mx 88.0255 T 15 w=2.2900 (,) -Mx 92.9920 +Mx 92.9919 T 87 72 91 87 w=16.5332 (text) -Mx 109.5252 +Mx 109.5251 T 15 w=2.2900 (,) -Mx 114.4917 +Mx 114.4915 T 48 68 87 75 48 47 w=34.4336 (MathML) -Mx 148.9253 +Mx 148.9251 T 29 w=2.2900 (:) -Mx 153.9046 +Mx 153.9043 My 144.7283 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2732 w=4.9200 (nil) -Mx 158.4646 +T 2765 w=4.9200 (nil) +Mx 158.4643 My 146.8283 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 168.6146 +Mx 168.6143 My 144.7283 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 181.0946 +Mx 181.0943 T 18 w=4.6500 (nil) -Mx 153.9046 +Mx 153.9043 My 159.9883 -T 2732 w=4.9200 (nil) -Mx 158.4646 +T 2765 w=4.9200 (nil) +Mx 158.4643 My 162.0883 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 18 w=3.7200 (nil) -Mx 168.6146 +Mx 168.6143 My 159.9883 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 181.0946 +Mx 181.0943 T 18 w=4.6500 (nil) -Mx 153.8918 -My 175.3743 -T 2732 w=4.9200 (nil) -Mx 158.4518 -My 177.4743 +Mx 153.8915 +My 175.6743 +T 2765 w=4.9200 (nil) +Mx 158.4515 +My 177.7743 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 168.6146 -My 175.3743 +T 2758 w=3.7328 (nil) +Mx 168.6143 +My 175.6743 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 181.0946 -T 2732 w=4.9200 (nil) -Mx 185.6546 -My 177.4743 +Mx 181.0943 +T 2765 w=4.9200 (nil) +Mx 185.6543 +My 177.7743 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 189.3874 -T 2061 w=5.1840 (nil) -Mx 194.5714 +T 2758 w=3.7328 (nil) +Mx 189.3871 +T 2088 w=5.1840 (nil) +Mx 194.5711 T 18 w=3.7200 (nil) -Mx 200.9779 -My 175.3743 +Mx 200.9774 +My 175.6743 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) -Mx 209.7143 -T 2732 w=4.9200 (nil) -Mx 214.2743 -My 177.4743 +Mx 209.7137 +T 2765 w=4.9200 (nil) +Mx 214.2737 +My 177.7743 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 218.0071 -T 2061 w=5.1840 (nil) -Mx 223.1911 +T 2758 w=3.7328 (nil) +Mx 218.0065 +T 2088 w=5.1840 (nil) +Mx 223.1905 T 19 w=3.7200 (nil) -Mx 227.3411 -My 175.3743 +Mx 227.3405 +My 175.6743 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 231.2078 -T 2043 w=4.8800 (nil) -Mx 236.0878 -T 2725 w=4.7100 (nil) -Mx 243.6611 -T 2589 w=6.4800 (nil) -Mx 253.0044 +Mx 231.2072 +T 2070 w=5.9800 (nil) +Mx 237.1872 +T 2758 w=4.7100 (nil) +Mx 244.7601 +T 2618 w=6.4800 (nil) +Mx 254.1031 T 19 w=4.6500 (nil) Mx 49.7638 -My 186.1227 +My 186.4227 Set font Gentium Plus;10;400;;normal;;;LTR T 41 82 85 80 88 79 68 86 w=38.2617 (Formulas) Mx 88.0255 @@ -178,79 +178,79 @@ Mx 127.2809 T 48 68 87 75 48 47 w=34.4336 (MathML) Mx 161.7145 T 29 w=2.2900 (:) -Mx 245.8891 -My 204.7261 +Mx 245.3391 +My 205.0261 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2732 w=4.9200 (nil) -Mx 250.4491 -My 206.8261 +T 2765 w=4.9200 (nil) +Mx 249.8991 +My 207.1261 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 260.5991 -My 204.7261 +Mx 260.0491 +My 205.0261 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 273.0791 +Mx 272.5291 T 18 w=4.6500 (nil) -Mx 245.8891 -My 219.9861 -T 2732 w=4.9200 (nil) -Mx 250.4491 -My 222.0861 +Mx 245.3391 +My 220.2861 +T 2765 w=4.9200 (nil) +Mx 249.8991 +My 222.3861 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 18 w=3.7200 (nil) -Mx 260.5991 -My 219.9861 +Mx 260.0491 +My 220.2861 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 273.0791 +Mx 272.5291 T 18 w=4.6500 (nil) -Mx 245.8763 -My 235.3721 -T 2732 w=4.9200 (nil) -Mx 250.4363 -My 237.4721 +Mx 245.3263 +My 235.9721 +T 2765 w=4.9200 (nil) +Mx 249.8863 +My 238.0721 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 260.5991 -My 235.3721 +T 2758 w=3.7328 (nil) +Mx 260.0491 +My 235.9721 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 273.0791 -T 2732 w=4.9200 (nil) -Mx 277.6391 -My 237.4721 +Mx 272.5291 +T 2765 w=4.9200 (nil) +Mx 277.0891 +My 238.0721 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 281.3719 -T 2061 w=5.1840 (nil) -Mx 286.5559 +T 2758 w=3.7328 (nil) +Mx 280.8219 +T 2088 w=5.1840 (nil) +Mx 286.0059 T 18 w=3.7200 (nil) -Mx 292.9281 -My 235.3721 +Mx 292.3781 +My 235.9721 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) -Mx 301.6303 -T 2732 w=4.9200 (nil) -Mx 306.1903 -My 237.4721 +Mx 301.0803 +T 2765 w=4.9200 (nil) +Mx 305.6403 +My 238.0721 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 309.9231 -T 2061 w=5.1840 (nil) -Mx 315.1071 +T 2758 w=3.7328 (nil) +Mx 309.3731 +T 2088 w=5.1840 (nil) +Mx 314.5571 T 19 w=3.7200 (nil) -Mx 319.2571 -My 235.3721 +Mx 318.7071 +My 235.9721 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 323.1238 -T 2043 w=4.8800 (nil) -Mx 328.0038 -T 2725 w=4.7100 (nil) -Mx 335.4916 -T 2589 w=6.4800 (nil) -Mx 344.7493 +Mx 322.5738 +T 2070 w=5.9800 (nil) +Mx 328.5538 +T 2758 w=4.7100 (nil) +Mx 336.0416 +T 2618 w=6.4800 (nil) +Mx 345.2993 T 19 w=4.6500 (nil) Mx 295.2916 My 780.6177 diff --git a/tests/math-tables-tex.expected b/tests/math-tables-tex.expected index e3b18398a..9217f7766 100644 --- a/tests/math-tables-tex.expected +++ b/tests/math-tables-tex.expected @@ -77,95 +77,95 @@ T 19 w=4.6500 (nil) Mx 305.9628 T 18 w=4.6500 (nil) Mx 49.7638 -My 160.7013 +My 160.8513 Set font Gentium Plus;10;400;;normal;;;LTR T 41 82 85 80 88 79 68 86 w=38.2617 (Formulas) Mx 88.0255 T 15 w=2.2900 (,) -Mx 92.9940 +Mx 92.9939 T 87 72 91 87 w=16.5332 (text) -Mx 109.5272 +Mx 109.5271 T 15 w=2.2900 (,) -Mx 114.4957 +Mx 114.4955 T 55 72 59 w=16.2793 (TeX) -Mx 130.7750 +Mx 130.7748 T 29 w=2.2900 (:) -Mx 135.7563 +Mx 135.7560 My 144.7283 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2732 w=4.9200 (nil) -Mx 140.3163 +T 2765 w=4.9200 (nil) +Mx 140.3160 My 146.8283 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 150.4663 +Mx 150.4660 My 144.7283 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 162.9463 +Mx 162.9460 T 18 w=4.6500 (nil) -Mx 135.7563 +Mx 135.7560 My 159.9883 -T 2732 w=4.9200 (nil) -Mx 140.3163 +T 2765 w=4.9200 (nil) +Mx 140.3160 My 162.0883 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 18 w=3.7200 (nil) -Mx 150.4663 +Mx 150.4660 My 159.9883 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 162.9463 +Mx 162.9460 T 18 w=4.6500 (nil) -Mx 135.7435 -My 175.3743 -T 2732 w=4.9200 (nil) -Mx 140.3035 -My 177.4743 +Mx 135.7432 +My 175.6743 +T 2765 w=4.9200 (nil) +Mx 140.3032 +My 177.7743 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 150.4663 -My 175.3743 +T 2758 w=3.7328 (nil) +Mx 150.4660 +My 175.6743 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 162.9463 -T 2732 w=4.9200 (nil) -Mx 167.5063 -My 177.4743 +Mx 162.9460 +T 2765 w=4.9200 (nil) +Mx 167.5060 +My 177.7743 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 171.2391 -T 2061 w=5.1840 (nil) -Mx 176.4231 +T 2758 w=3.7328 (nil) +Mx 171.2388 +T 2088 w=5.1840 (nil) +Mx 176.4228 T 18 w=3.7200 (nil) -Mx 182.8316 -My 175.3743 +Mx 182.8311 +My 175.6743 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) -Mx 191.5700 -T 2732 w=4.9200 (nil) -Mx 196.1300 -My 177.4743 +Mx 191.5694 +T 2765 w=4.9200 (nil) +Mx 196.1294 +My 177.7743 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 199.8628 -T 2061 w=5.1840 (nil) -Mx 205.0468 +T 2758 w=3.7328 (nil) +Mx 199.8622 +T 2088 w=5.1840 (nil) +Mx 205.0462 T 19 w=3.7200 (nil) -Mx 209.1968 -My 175.3743 +Mx 209.1962 +My 175.6743 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 213.0635 -T 2043 w=4.8800 (nil) -Mx 217.9435 -T 2725 w=4.7100 (nil) -Mx 225.5218 -T 2589 w=6.4800 (nil) -Mx 234.8701 +Mx 213.0629 +T 2070 w=5.9800 (nil) +Mx 219.0429 +T 2758 w=4.7100 (nil) +Mx 226.6209 +T 2618 w=6.4800 (nil) +Mx 235.9689 T 19 w=4.6500 (nil) Mx 49.7638 -My 186.1227 +My 186.4227 Set font Gentium Plus;10;400;;normal;;;LTR T 41 82 85 80 88 79 68 86 w=38.2617 (Formulas) Mx 88.0255 @@ -178,79 +178,79 @@ Mx 114.5192 T 55 72 59 w=16.2793 (TeX) Mx 130.7985 T 29 w=2.2900 (:) -Mx 245.8891 -My 203.7740 +Mx 245.3391 +My 204.0740 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2732 w=4.9200 (nil) -Mx 250.4491 -My 205.8740 +T 2765 w=4.9200 (nil) +Mx 249.8991 +My 206.1740 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 17 w=3.7200 (nil) -Mx 260.5991 -My 203.7740 +Mx 260.0491 +My 204.0740 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 273.0791 +Mx 272.5291 T 18 w=4.6500 (nil) -Mx 245.8891 -My 219.0340 -T 2732 w=4.9200 (nil) -Mx 250.4491 -My 221.1340 +Mx 245.3391 +My 219.3340 +T 2765 w=4.9200 (nil) +Mx 249.8991 +My 221.4340 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 18 w=3.7200 (nil) -Mx 260.5991 -My 219.0340 +Mx 260.0491 +My 219.3340 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 273.0791 +Mx 272.5291 T 18 w=4.6500 (nil) -Mx 245.8763 -My 234.4200 -T 2732 w=4.9200 (nil) -Mx 250.4363 -My 236.5200 +Mx 245.3263 +My 235.0200 +T 2765 w=4.9200 (nil) +Mx 249.8863 +My 237.1200 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 260.5991 -My 234.4200 +T 2758 w=3.7328 (nil) +Mx 260.0491 +My 235.0200 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 30 w=6.4800 (nil) -Mx 273.0791 -T 2732 w=4.9200 (nil) -Mx 277.6391 -My 236.5200 +Mx 272.5291 +T 2765 w=4.9200 (nil) +Mx 277.0891 +My 237.1200 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 281.3719 -T 2061 w=5.1840 (nil) -Mx 286.5559 +T 2758 w=3.7328 (nil) +Mx 280.8219 +T 2088 w=5.1840 (nil) +Mx 286.0059 T 18 w=3.7200 (nil) -Mx 292.9281 -My 234.4200 +Mx 292.3781 +My 235.0200 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 12 w=6.4800 (nil) -Mx 301.6303 -T 2732 w=4.9200 (nil) -Mx 306.1903 -My 236.5200 +Mx 301.0803 +T 2765 w=4.9200 (nil) +Mx 305.6403 +My 237.1200 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 309.9231 -T 2061 w=5.1840 (nil) -Mx 315.1071 +T 2758 w=3.7328 (nil) +Mx 309.3731 +T 2088 w=5.1840 (nil) +Mx 314.5571 T 19 w=3.7200 (nil) -Mx 319.2571 -My 234.4200 +Mx 318.7071 +My 235.0200 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 323.1238 -T 2043 w=4.8800 (nil) -Mx 328.0038 -T 2725 w=4.7100 (nil) -Mx 335.4916 -T 2589 w=6.4800 (nil) -Mx 344.7493 +Mx 322.5738 +T 2070 w=5.9800 (nil) +Mx 328.5538 +T 2758 w=4.7100 (nil) +Mx 336.0416 +T 2618 w=6.4800 (nil) +Mx 345.2993 T 19 w=4.6500 (nil) Mx 295.2916 My 780.6177 diff --git a/tests/math-variants.expected b/tests/math-variants.expected index 574af2a5c..36c4000ae 100644 --- a/tests/math-variants.expected +++ b/tests/math-variants.expected @@ -4,70 +4,70 @@ Mx 49.7638 My 50.0745 Set font Gentium Plus;10;400;;normal;;;LTR T 48 68 87 75 w=21.6113 (Math) -Mx 74.0473 +Mx 74.0469 T 89 68 85 76 68 81 87 86 w=33.6035 (variants) -Mx 107.6508 +Mx 107.6504 T 15 w=2.2900 (,) -Mx 112.6130 +Mx 112.6122 T 87 72 91 87 w=16.5332 (text) -Mx 129.1462 +Mx 129.1454 T 15 w=2.2900 (,) -Mx 134.1084 +Mx 134.1072 T 48 68 87 75 48 47 w=34.4336 (MathML) -Mx 168.5420 +Mx 168.5408 T 29 w=2.2900 (:) -Mx 173.5042 +Mx 173.5026 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2043 w=4.8800 (nil) -Mx 178.3842 -T 2725 w=4.7100 (nil) -Mx 185.9467 -T 2051 w=5.0000 (nil) -Mx 193.7991 +T 2070 w=5.9800 (nil) +Mx 179.4826 +T 2758 w=4.7100 (nil) +Mx 187.0439 +T 2078 w=6.3700 (nil) +Mx 196.2653 T 1880 w=8.2400 (nil) -Mx 202.0391 +Mx 204.5053 T 13 w=2.2000 (nil) -Mx 205.9058 +Mx 208.3720 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 209.4658 +Mx 211.9320 T 70 w=4.4700 (nil) -Mx 213.9358 +Mx 216.4020 My 46.9745 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 218.0986 +T 2758 w=3.7328 (nil) +Mx 220.5648 My 50.0745 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 221.9653 -T 2967 2957 2962 w=14.3900 (nil) -Mx 236.3553 +Mx 224.4315 +T 3000 2990 2995 w=14.3900 (nil) +Mx 238.8215 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 239.9153 -T 2725 w=4.7100 (nil) -Mx 244.6253 +Mx 242.3815 +T 2758 w=4.7100 (nil) +Mx 247.0915 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 248.1853 +Mx 250.6515 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 254.5977 -T 2051 w=5.0000 (nil) -Mx 262.4502 +Mx 257.0628 +T 2078 w=6.3700 (nil) +Mx 266.2842 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 266.0102 +Mx 269.8442 T 1887 w=6.1800 (nil) -Mx 274.4423 -T 2572 w=5.2700 (nil) -Mx 281.9644 +Mx 278.2759 +T 2601 w=5.2700 (nil) +Mx 285.7976 T 1884 w=7.0200 (nil) -Mx 288.9844 +Mx 292.8176 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 292.5444 +Mx 296.3776 My 46.9745 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 19 w=3.7200 (nil) @@ -75,78 +75,78 @@ Mx 49.7638 My 67.5285 Set font Gentium Plus;10;400;;normal;;;LTR T 48 68 87 75 w=21.6113 (Math) -Mx 74.0307 +Mx 74.0300 T 89 68 85 76 68 81 87 86 w=33.6035 (variants) -Mx 107.6343 +Mx 107.6335 T 15 w=2.2900 (,) -Mx 112.5799 +Mx 112.5784 T 87 72 91 87 w=16.5332 (text) -Mx 131.7688 +Mx 131.7665 T 11 w=3.1689 (() -Mx 134.9377 +Mx 134.9354 T 79 68 85 74 72 w=20.7568 (large) -Mx 158.3502 +Mx 158.3471 T 73 82 81 87 w=17.0996 (font) -Mx 175.4498 +Mx 175.4467 T 12 w=3.1689 ()) -Mx 178.6187 +Mx 178.6157 T 15 w=2.2900 (,) -Mx 183.5644 +Mx 183.5606 T 48 68 87 75 48 47 w=34.4336 (MathML) -Mx 217.9980 +Mx 217.9942 T 29 w=2.2900 (:) -Mx 225.5993 +Mx 225.5940 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2043 w=8.7840 (nil) -Mx 234.3833 -T 2725 w=8.4780 (nil) -Mx 247.9205 -T 2051 w=9.0000 (nil) -Mx 261.9798 +T 2070 w=10.7640 (nil) +Mx 236.3580 +T 2758 w=8.4780 (nil) +Mx 249.8918 +T 2078 w=11.4660 (nil) +Mx 266.4136 T 1880 w=14.8320 (nil) -Mx 276.8118 +Mx 281.2456 T 13 w=3.9600 (nil) -Mx 283.7718 +Mx 288.2056 Mx 5.0760 T 9 a=6.4080 (nil) -Mx 290.1798 +Mx 294.6136 T 70 w=8.0460 (nil) -Mx 298.2258 +Mx 302.6596 My 61.9485 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2725 w=6.7190 (nil) -Mx 305.7188 +T 2758 w=6.7190 (nil) +Mx 310.1526 My 67.5285 Set font Libertinus Math;18;400;Regular;normal;;;LTR T 13 w=3.9600 (nil) -Mx 312.6788 -T 2967 2957 2962 w=25.9020 (nil) -Mx 338.5808 +Mx 317.1126 +T 3000 2990 2995 w=25.9020 (nil) +Mx 343.0146 Mx 5.0760 T 9 a=6.4080 (nil) -Mx 344.9888 -T 2725 w=8.4780 (nil) -Mx 353.4668 +Mx 349.4226 +T 2758 w=8.4780 (nil) +Mx 357.9006 Mx 5.0760 T 10 a=6.4080 (nil) -Mx 359.8748 +Mx 364.3086 Mx 5.0760 T 10 a=6.4080 (nil) -Mx 371.3421 -T 2051 w=9.0000 (nil) -Mx 385.4014 +Mx 375.7725 +T 2078 w=11.4660 (nil) +Mx 392.2943 Mx 5.0760 T 9 a=6.4080 (nil) -Mx 391.8094 +Mx 398.7023 T 1887 w=11.1240 (nil) -Mx 406.9571 -T 2572 w=9.4860 (nil) -Mx 420.4668 +Mx 413.8486 +T 2601 w=9.4860 (nil) +Mx 427.3569 T 1884 w=12.6360 (nil) -Mx 433.1028 +Mx 439.9929 Mx 5.0760 T 10 a=6.4080 (nil) -Mx 439.5108 +Mx 446.4009 My 61.9485 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR T 19 w=6.6960 (nil) @@ -166,59 +166,59 @@ Mx 146.9143 T 48 68 87 75 48 47 w=34.4336 (MathML) Mx 181.3479 T 29 w=2.2900 (:) -Mx 234.9220 +Mx 233.0020 My 101.0123 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2043 w=4.8800 (nil) -Mx 239.8020 -T 2725 w=4.7100 (nil) -Mx 247.2897 -T 2051 w=5.0000 (nil) -Mx 255.0675 +T 2070 w=5.9800 (nil) +Mx 238.9820 +T 2758 w=4.7100 (nil) +Mx 246.4697 +T 2078 w=6.3700 (nil) +Mx 255.6175 T 1880 w=8.2400 (nil) -Mx 263.3075 +Mx 263.8575 T 13 w=2.2000 (nil) -Mx 267.1742 +Mx 267.7242 Mx 3.0000 -T 3653 a=4.2100 (nil) -Mx 271.3842 +T 3798 a=4.2100 (nil) +Mx 271.9342 T 70 w=4.4700 (nil) -Mx 275.8542 +Mx 276.4042 My 97.2623 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 280.0170 +T 2758 w=3.7328 (nil) +Mx 280.5670 My 101.0123 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 283.8836 -T 2967 2957 2962 w=14.3900 (nil) -Mx 298.2736 +Mx 284.4336 +T 3000 2990 2995 w=14.3900 (nil) +Mx 298.8236 Mx 3.0000 -T 3653 a=4.2100 (nil) -Mx 302.4836 -T 2725 w=4.7100 (nil) -Mx 307.1936 +T 3798 a=4.2100 (nil) +Mx 303.0336 +T 2758 w=4.7100 (nil) +Mx 307.7436 Mx 2.9900 -T 3654 a=4.2100 (nil) -Mx 311.4036 +T 3799 a=4.2100 (nil) +Mx 311.9536 Mx 2.9900 -T 3654 a=4.2100 (nil) -Mx 318.3914 -T 2051 w=5.0000 (nil) -Mx 326.1692 +T 3799 a=4.2100 (nil) +Mx 318.9414 +T 2078 w=6.3700 (nil) +Mx 328.0892 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 329.7292 +Mx 331.6492 T 1887 w=6.1800 (nil) -Mx 338.1314 -T 2572 w=5.2700 (nil) -Mx 345.6236 +Mx 340.0514 +T 2601 w=5.2700 (nil) +Mx 347.5436 T 1884 w=7.0200 (nil) -Mx 352.6436 +Mx 354.5636 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 356.2036 +Mx 358.1236 My 97.2623 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 19 w=3.7200 (nil) @@ -246,59 +246,59 @@ Mx 196.4507 T 48 68 87 75 48 47 w=34.4336 (MathML) Mx 230.8842 T 29 w=2.2900 (:) -Mx 184.7493 +Mx 181.2933 My 150.1518 Set font Libertinus Math;18;400;Regular;normal;;;LTR -T 2043 w=8.7840 (nil) -Mx 193.5333 -T 2725 w=8.4780 (nil) -Mx 207.0113 -T 2051 w=9.0000 (nil) -Mx 221.0113 +T 2070 w=10.7640 (nil) +Mx 192.0573 +T 2758 w=8.4780 (nil) +Mx 205.5353 +T 2078 w=11.4660 (nil) +Mx 222.0013 T 1880 w=14.8320 (nil) -Mx 235.8433 +Mx 236.8333 T 13 w=3.9600 (nil) -Mx 242.8033 +Mx 243.7933 Mx 5.4000 -T 3653 a=7.5780 (nil) -Mx 250.3813 +T 3798 a=7.5780 (nil) +Mx 251.3713 T 70 w=8.0460 (nil) -Mx 258.4273 +Mx 259.4173 My 143.4018 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR -T 2725 w=6.7190 (nil) -Mx 265.9203 +T 2758 w=6.7190 (nil) +Mx 266.9103 My 150.1518 Set font Libertinus Math;18;400;Regular;normal;;;LTR T 13 w=3.9600 (nil) -Mx 272.8803 -T 2967 2957 2962 w=25.9020 (nil) -Mx 298.7823 +Mx 273.8703 +T 3000 2990 2995 w=25.9020 (nil) +Mx 299.7723 Mx 5.4000 -T 3653 a=7.5780 (nil) -Mx 306.3603 -T 2725 w=8.4780 (nil) -Mx 314.8383 +T 3798 a=7.5780 (nil) +Mx 307.3503 +T 2758 w=8.4780 (nil) +Mx 315.8283 Mx 5.3820 -T 3654 a=7.5780 (nil) -Mx 322.4163 +T 3799 a=7.5780 (nil) +Mx 323.4063 Mx 5.3820 -T 3654 a=7.5780 (nil) -Mx 334.9943 -T 2051 w=9.0000 (nil) -Mx 348.9943 +T 3799 a=7.5780 (nil) +Mx 335.9843 +T 2078 w=11.4660 (nil) +Mx 352.4503 Mx 5.0760 T 9 a=6.4080 (nil) -Mx 355.4023 +Mx 358.8583 T 1887 w=11.1240 (nil) -Mx 370.5263 -T 2572 w=9.4860 (nil) -Mx 384.0123 +Mx 373.9823 +T 2601 w=9.4860 (nil) +Mx 387.4683 T 1884 w=12.6360 (nil) -Mx 396.6483 +Mx 400.1043 Mx 5.0760 T 10 a=6.4080 (nil) -Mx 403.0563 +Mx 406.5123 My 143.4018 Set font Libertinus Math;14.4;400;Regular;normal;;;LTR T 19 w=6.6960 (nil) @@ -306,70 +306,70 @@ Mx 49.7638 My 171.9758 Set font Gentium Plus;10;400;;normal;;;LTR T 48 68 87 75 w=21.6113 (Math) -Mx 74.0495 +Mx 74.0491 T 89 68 85 76 68 81 87 86 w=33.6035 (variants) -Mx 107.6531 +Mx 107.6526 T 15 w=2.2900 (,) -Mx 112.6175 +Mx 112.6167 T 87 72 91 87 w=16.5332 (text) -Mx 129.1507 +Mx 129.1499 T 15 w=2.2900 (,) -Mx 134.1152 +Mx 134.1139 T 55 72 59 w=16.2793 (TeX) -Mx 150.3945 +Mx 150.3932 T 29 w=2.2900 (:) -Mx 155.3590 +Mx 155.3573 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2043 w=4.8800 (nil) -Mx 160.2390 -T 2725 w=4.7100 (nil) -Mx 167.8071 -T 2051 w=5.0000 (nil) -Mx 175.6652 +T 2070 w=5.9800 (nil) +Mx 161.3373 +T 2758 w=4.7100 (nil) +Mx 168.9044 +T 2078 w=6.3700 (nil) +Mx 178.1314 T 1880 w=8.2400 (nil) -Mx 183.9052 +Mx 186.3714 T 13 w=2.2000 (nil) -Mx 187.7719 +Mx 190.2381 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 191.3319 +Mx 193.7981 T 70 w=4.4700 (nil) -Mx 195.8019 +Mx 198.2681 My 168.8758 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 199.9647 +T 2758 w=3.7328 (nil) +Mx 202.4309 My 171.9758 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 203.8314 +Mx 206.2976 T 84 74 79 w=12.0300 (nil) -Mx 215.8614 +Mx 218.3276 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 219.4214 -T 2725 w=4.7100 (nil) -Mx 224.1314 +Mx 221.8876 +T 2758 w=4.7100 (nil) +Mx 226.5976 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 227.6914 +Mx 230.1576 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 234.1095 -T 2051 w=5.0000 (nil) -Mx 241.9677 +Mx 236.5746 +T 2078 w=6.3700 (nil) +Mx 245.8017 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 245.5277 +Mx 249.3617 T 1887 w=6.1800 (nil) -Mx 253.9620 -T 2572 w=5.2700 (nil) -Mx 261.4864 +Mx 257.7956 +T 2601 w=5.2700 (nil) +Mx 265.3196 T 1884 w=7.0200 (nil) -Mx 268.5064 +Mx 272.3396 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 272.0664 +Mx 275.8996 My 168.8758 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 19 w=3.7200 (nil) @@ -389,59 +389,59 @@ Mx 146.9203 T 55 72 59 w=16.2793 (TeX) Mx 163.1996 T 29 w=2.2900 (:) -Mx 236.1020 +Mx 234.1820 My 205.1292 Set font Libertinus Math;10;400;Regular;normal;;;LTR -T 2043 w=4.8800 (nil) -Mx 240.9820 -T 2725 w=4.7100 (nil) -Mx 248.4697 -T 2051 w=5.0000 (nil) -Mx 256.2475 +T 2070 w=5.9800 (nil) +Mx 240.1620 +T 2758 w=4.7100 (nil) +Mx 247.6497 +T 2078 w=6.3700 (nil) +Mx 256.7975 T 1880 w=8.2400 (nil) -Mx 264.4875 +Mx 265.0375 T 13 w=2.2000 (nil) -Mx 268.3542 +Mx 268.9042 Mx 3.0000 -T 3653 a=4.2100 (nil) -Mx 272.5642 +T 3798 a=4.2100 (nil) +Mx 273.1142 T 70 w=4.4700 (nil) -Mx 277.0342 +Mx 277.5842 My 201.3792 Set font Libertinus Math;8;400;Regular;normal;;;LTR -T 2725 w=3.7328 (nil) -Mx 281.1970 +T 2758 w=3.7328 (nil) +Mx 281.7470 My 205.1292 Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) -Mx 285.0636 +Mx 285.6136 T 84 74 79 w=12.0300 (nil) -Mx 297.0936 +Mx 297.6436 Mx 3.0000 -T 3653 a=4.2100 (nil) -Mx 301.3036 -T 2725 w=4.7100 (nil) -Mx 306.0136 +T 3798 a=4.2100 (nil) +Mx 301.8536 +T 2758 w=4.7100 (nil) +Mx 306.5636 Mx 2.9900 -T 3654 a=4.2100 (nil) -Mx 310.2236 +T 3799 a=4.2100 (nil) +Mx 310.7736 Mx 2.9900 -T 3654 a=4.2100 (nil) -Mx 317.2114 -T 2051 w=5.0000 (nil) -Mx 324.9892 +T 3799 a=4.2100 (nil) +Mx 317.7614 +T 2078 w=6.3700 (nil) +Mx 326.9092 Mx 2.8200 T 9 a=3.5600 (nil) -Mx 328.5492 +Mx 330.4692 T 1887 w=6.1800 (nil) -Mx 336.9514 -T 2572 w=5.2700 (nil) -Mx 344.4436 +Mx 338.8714 +T 2601 w=5.2700 (nil) +Mx 346.3636 T 1884 w=7.0200 (nil) -Mx 351.4636 +Mx 353.3836 Mx 2.8200 T 10 a=3.5600 (nil) -Mx 355.0236 +Mx 356.9436 My 201.3792 Set font Libertinus Math;8;400;Regular;normal;;;LTR T 19 w=3.7200 (nil) From 9bffe4be9df0e64d7acf084df11c7d90f5da6d77 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 24 Sep 2024 01:08:38 +0300 Subject: [PATCH 10/23] test(fonts): Fix OpenType unit tests to match Libertinus used in CI --- spec/opentype_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/opentype_spec.lua b/spec/opentype_spec.lua index 7ecf4a8bc..82c4342ed 100644 --- a/spec/opentype_spec.lua +++ b/spec/opentype_spec.lua @@ -20,6 +20,6 @@ describe("The OpenType loader/parser", function () it("should convert Microsoft-platform name strings to UTF8", function () local version = font.names[5]["en-US"][1] - assert.is.equal("Version 7.020;RELEASE", version) + assert.is.equal("Version 7.050;RELEASE", version) end) end) From 55a4ba343f76937cee4ace536ddedecb171800bf Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 27 Sep 2024 22:09:54 +0300 Subject: [PATCH 11/23] fix(docker): Setup system locales in containers where it actually counts, not before --- Dockerfile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index f28202a65..23578d077 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,22 +7,11 @@ FROM docker.io/library/archlinux:base-devel$ARCHTAG AS builder ARG RUNTIME_DEPS ARG BUILD_DEPS -# Enable system locales for everything we have localizations for so tools like -# `date` will output matching localized strings. By default Arch Docker images -# have almost all locale data stripped out. This also makes it easier to -# rebuild custom Docker images with extra languages supported. -RUN sed -i -e '/^NoExtract.*locale/d' /etc/pacman.conf - # Freshen all base system packages RUN pacman-key --init RUN pacman --needed --noconfirm -Syq archlinux-keyring RUN pacman --needed --noconfirm -Suq -# Make sure *at least* glibc actually got reinstalled after enabling -# extraaction of locale files even if the version was fresh so we can use the -# locale support out of it later. -RUN pacman --noconfirm -Sq glibc && yes | pacman -Sccq - # Install run-time dependencies RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS $BUILD_DEPS @@ -32,10 +21,6 @@ ARG REVISION COPY ./ /src WORKDIR /src -# Rebuild locale database after having added our supported locales. -RUN ls i18n/ | sed 's/[.-].*$/_/;s/^/^/' | sort -u | grep -Ef - /usr/share/i18n/SUPPORTED > /etc/locale.gen -RUN locale-gen - # GitHub Actions builder stopped providing git history :( # See feature request at https://github.com/actions/runner/issues/767 RUN build-aux/docker-bootstrap.sh @@ -58,6 +43,12 @@ ARG REVISION # Allow `su` with no root password so non-priv users can install dependencies RUN sed -i -e '/.so$/s/$/ nullok/' /etc/pam.d/su +# Enable system locales for everything we have localizations for so tools like +# `date` will output matching localized strings. By default Arch Docker images +# have almost all locale data stripped out. This also makes it easier to +# rebuild custom Docker images with extra languages supported. +RUN sed -i -e '/^NoExtract.*locale/d' /etc/pacman.conf + # Set system locale to something other than 'C' that resolves to a real language ENV LANG=en_US.UTF-8 @@ -66,6 +57,11 @@ RUN pacman-key --init RUN pacman --needed --noconfirm -Syq archlinux-keyring && yes | pacman -Sccq RUN pacman --needed --noconfirm -Suq && yes | pacman -Sccq +# Make sure *at least* glibc actually got reinstalled after enabling +# extraction of locale files even if the version was fresh so we can use the +# locale support out of it later. +RUN pacman --noconfirm -Sq glibc && yes | pacman -Sccq + # Install run-time dependencies RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS && yes | pacman -Sccq @@ -82,6 +78,11 @@ COPY build-aux/docker-fontconfig.conf /etc/fonts/conf.d/99-docker.conf COPY --from=builder /pkgdir / COPY --from=builder /src/src/sile-entry.sh /usr/local/bin + +# Rebuild locale database after having added our supported locales. +RUN ls /usr/local/share/sile/i18n/ | sed 's/[.-].*$/_/;s/^/^/' | sort -u | grep -Ef - /usr/share/i18n/SUPPORTED > /etc/locale.gen +RUN locale-gen + RUN sile --version WORKDIR /data From d53acf366c54b5ac59a2dda1c8d883b0d7bfb991 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 27 Sep 2024 23:03:44 +0300 Subject: [PATCH 12/23] chore(docker): Update Arch system package name for Libertinus Fonts --- hooks/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/build b/hooks/build index f982069db..2a7a82560 100755 --- a/hooks/build +++ b/hooks/build @@ -7,7 +7,7 @@ set -e REVISION=$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g') RUNTIME_DEPS='fontconfig freetype2 gentium-plus-font glibc harfbuzz icu libpng luajit zlib'\ -' libertinus-font luarocks noto-fonts-cjk ttf-hack' +' otf-libertinus luarocks noto-fonts-cjk ttf-hack' BUILD_DEPS='cargo git jq lua51 poppler' : "${DOCKER_BUILDKIT:=1}" From 57ab6b758c1e8716e20d694a62194af75d444b90 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Fri, 27 Sep 2024 23:16:17 +0300 Subject: [PATCH 13/23] refactor(docker): Eliminate Lua 5.1 during build, use LuaJIT as default interpreter --- Dockerfile | 6 ++++++ hooks/build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 23578d077..23445a7ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,12 @@ RUN pacman --needed --noconfirm -Suq # Install run-time dependencies RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS $BUILD_DEPS +# Setup LuaRocks for use with LuaJIT roughly matching SILE's internal VM +RUN luarocks config lua_version 5.1 && \ + luarocks config lua_interpreter luajit && \ + luarocks config variables.LUA "$(command -v luajit)" && \ + luarocks config variables.LUA_INCDIR /usr/include/luajit-2.1/ + # Set at build time, forces Docker’s layer caching to reset at this point ARG REVISION diff --git a/hooks/build b/hooks/build index 2a7a82560..cd3190e32 100755 --- a/hooks/build +++ b/hooks/build @@ -8,7 +8,7 @@ REVISION=$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g') RUNTIME_DEPS='fontconfig freetype2 gentium-plus-font glibc harfbuzz icu libpng luajit zlib'\ ' otf-libertinus luarocks noto-fonts-cjk ttf-hack' -BUILD_DEPS='cargo git jq lua51 poppler' +BUILD_DEPS='cargo git jq poppler' : "${DOCKER_BUILDKIT:=1}" export DOCKER_BUILDKIT From 388b1df7f806d4c2d24da2379d23801a2819c1aa Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 28 Sep 2024 00:06:20 +0300 Subject: [PATCH 14/23] refactor(docker): Redo container using base/builder/final model For less code repetition and smaller images. --- Dockerfile | 76 +++++++++++++++++++++++++++++------------------------ hooks/build | 4 +-- 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23445a7ed..372eddc93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,18 +2,36 @@ ARG ARCHTAG -FROM docker.io/library/archlinux:base-devel$ARCHTAG AS builder +FROM docker.io/library/archlinux:$ARCHTAG AS base + +# Initialize keys so we can do package management +RUN pacman-key --init && pacman-key --populate + +# This hack can convince Docker its cache is obsolete; e.g. when the contents +# of downloaded resources have changed since being fetched. It's helpful to have +# this as a separate layer because it saves time for local builds. Incrementing +# this when pushing dependency updates to Caleb's Arch user repository or just +# when the remote Docker Hub builds die should be enough. +ARG DOCKER_HUB_CACHE=1 ARG RUNTIME_DEPS -ARG BUILD_DEPS + +# Enable system locales for everything we have localizations for so tools like +# `date` will output matching localized strings. By default Arch Docker images +# have almost all locale data stripped out. This also makes it easier to +# rebuild custom Docker images with extra languages supported. +RUN sed -i -e '/^NoExtract.*locale/d' /etc/pacman.conf # Freshen all base system packages -RUN pacman-key --init -RUN pacman --needed --noconfirm -Syq archlinux-keyring -RUN pacman --needed --noconfirm -Suq +RUN pacman --needed --noconfirm -Syuq && yes | pacman -Sccq + +# Make sure *at least* glibc actually got reinstalled after enabling +# extraction of locale files even if the version was fresh so we can use the +# locale support out of it later. +RUN pacman --noconfirm -Sq glibc && yes | pacman -Sccq # Install run-time dependencies -RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS $BUILD_DEPS +RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS && yes | pacman -Sccq # Setup LuaRocks for use with LuaJIT roughly matching SILE's internal VM RUN luarocks config lua_version 5.1 && \ @@ -21,55 +39,47 @@ RUN luarocks config lua_version 5.1 && \ luarocks config variables.LUA "$(command -v luajit)" && \ luarocks config variables.LUA_INCDIR /usr/include/luajit-2.1/ +# Setup separate image for build so we don’t bloat the final image +FROM base AS builder + +ARG BUILD_DEPS + +# Install build time dependencies +RUN pacman --needed --noconfirm -Sq $BUILD_DEPS && yes | pacman -Sccq + # Set at build time, forces Docker’s layer caching to reset at this point ARG REVISION COPY ./ /src WORKDIR /src +# Take note of SILE's supported locales so the final system can build localized messages +RUN ls i18n/ | sed 's/[.-].*$/_/;s/^/^/' | sort -u | grep -Ef - /usr/share/i18n/SUPPORTED > /etc/locale.gen + # GitHub Actions builder stopped providing git history :( # See feature request at https://github.com/actions/runner/issues/767 RUN build-aux/docker-bootstrap.sh RUN ./bootstrap.sh -RUN ./configure --with-system-lua-sources --without-manual +RUN ./configure --mandir='$prefix}/man' --with-system-lua-sources --without-system-luarocks --without-manual RUN make RUN make install DESTDIR=/pkgdir -# Work around BuiltKit / buildx bug, they can’t copy to symlinks only dirs -RUN mv /pkgdir/usr/local/{share/,}/man - -FROM docker.io/library/archlinux:base$ARCHTAG AS final +FROM base AS final # Same args as above, repeated because they went out of scope with FROM -ARG RUNTIME_DEPS -ARG VERSION ARG REVISION +ARG VERSION # Allow `su` with no root password so non-priv users can install dependencies RUN sed -i -e '/.so$/s/$/ nullok/' /etc/pam.d/su -# Enable system locales for everything we have localizations for so tools like -# `date` will output matching localized strings. By default Arch Docker images -# have almost all locale data stripped out. This also makes it easier to -# rebuild custom Docker images with extra languages supported. -RUN sed -i -e '/^NoExtract.*locale/d' /etc/pacman.conf - # Set system locale to something other than 'C' that resolves to a real language ENV LANG=en_US.UTF-8 -# Freshen all base system packages (and cleanup cache) -RUN pacman-key --init -RUN pacman --needed --noconfirm -Syq archlinux-keyring && yes | pacman -Sccq -RUN pacman --needed --noconfirm -Suq && yes | pacman -Sccq - -# Make sure *at least* glibc actually got reinstalled after enabling -# extraction of locale files even if the version was fresh so we can use the -# locale support out of it later. -RUN pacman --noconfirm -Sq glibc && yes | pacman -Sccq - -# Install run-time dependencies -RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS && yes | pacman -Sccq +# Rebuild locale database so system apps have localized messages for SILE's supported locales +COPY --from=builder /etc/locale.gen /etc +RUN locale-gen LABEL org.opencontainers.image.title="SILE" LABEL org.opencontainers.image.description="A containerized version of the SILE typesetter" @@ -85,10 +95,6 @@ COPY build-aux/docker-fontconfig.conf /etc/fonts/conf.d/99-docker.conf COPY --from=builder /pkgdir / COPY --from=builder /src/src/sile-entry.sh /usr/local/bin -# Rebuild locale database after having added our supported locales. -RUN ls /usr/local/share/sile/i18n/ | sed 's/[.-].*$/_/;s/^/^/' | sort -u | grep -Ef - /usr/share/i18n/SUPPORTED > /etc/locale.gen -RUN locale-gen - RUN sile --version WORKDIR /data diff --git a/hooks/build b/hooks/build index cd3190e32..70b30b56d 100755 --- a/hooks/build +++ b/hooks/build @@ -1,14 +1,14 @@ #!/usr/bin/env sh set -e -: "${ARCHTAG:=}" +: "${ARCHTAG:=latest}" : "${DOCKERFILE:=Dockerfile}" REVISION=$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g') RUNTIME_DEPS='fontconfig freetype2 gentium-plus-font glibc harfbuzz icu libpng luajit zlib'\ ' otf-libertinus luarocks noto-fonts-cjk ttf-hack' -BUILD_DEPS='cargo git jq poppler' +BUILD_DEPS='base-devel cargo git jq poppler' : "${DOCKER_BUILDKIT:=1}" export DOCKER_BUILDKIT From 157bdaacf3c81750098969cf28dcbbcc6ee74be3 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 28 Sep 2024 18:00:55 +0300 Subject: [PATCH 15/23] chore(docker): Use clang/mold in container bulids for speed --- Dockerfile | 3 +++ hooks/build | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 372eddc93..418fde46b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,6 +60,9 @@ RUN ls i18n/ | sed 's/[.-].*$/_/;s/^/^/' | sort -u | grep -Ef - /usr/share/i18n/ # See feature request at https://github.com/actions/runner/issues/767 RUN build-aux/docker-bootstrap.sh +# Use clang and mold instead of gcc and ld for speed +ENV RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=mold" + RUN ./bootstrap.sh RUN ./configure --mandir='$prefix}/man' --with-system-lua-sources --without-system-luarocks --without-manual RUN make diff --git a/hooks/build b/hooks/build index 70b30b56d..28b002235 100755 --- a/hooks/build +++ b/hooks/build @@ -8,7 +8,7 @@ REVISION=$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g') RUNTIME_DEPS='fontconfig freetype2 gentium-plus-font glibc harfbuzz icu libpng luajit zlib'\ ' otf-libertinus luarocks noto-fonts-cjk ttf-hack' -BUILD_DEPS='base-devel cargo git jq poppler' +BUILD_DEPS='base-devel cargo clang git jq mold poppler' : "${DOCKER_BUILDKIT:=1}" export DOCKER_BUILDKIT From 548f42661d777a3c8882a6fd89e79601494fb796 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sat, 28 Sep 2024 22:47:44 +0300 Subject: [PATCH 16/23] feat(docker): Splice SILE's vendored rocks tree into system LuaRocks --- Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Dockerfile b/Dockerfile index 418fde46b..4892e935d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -95,6 +95,16 @@ LABEL org.opencontainers.image.revision="$REVISION" COPY build-aux/docker-fontconfig.conf /etc/fonts/conf.d/99-docker.conf +# Inform the system Lua manifest where SILE's vendored modules are so they are +# available to 3rd party packages even outside of SILE's runtime. Most notably +# useful so that luarocks can find them as existing dependencies when +# installing 3rd party modules. We replace the user tree instead of inserting +# a new one because it doesn't make sense in Docker anyway and the default +# priority works out better having it first. +RUN luarocks config rocks_trees[1].root /usr/local/share/sile/lua_modules && \ + luarocks config rocks_trees[1].name sile && \ + luarocks config deps_mode all + COPY --from=builder /pkgdir / COPY --from=builder /src/src/sile-entry.sh /usr/local/bin From c616286deeeb4359689d70c44d49aa5b3f2a0944 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sun, 29 Sep 2024 00:42:56 +0300 Subject: [PATCH 17/23] ci(actions): Fixup test build from packaged sources --- .github/workflows/build.yml | 2 +- tests/Dockerfile-dist | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9aaac0663..1a55ca7f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -124,7 +124,7 @@ jobs: run: | make fake-manual make distdir - - name: Build from package + - name: Build from dist tree run: | make docker-test-dist diff --git a/tests/Dockerfile-dist b/tests/Dockerfile-dist index b8424552b..e8697192b 100644 --- a/tests/Dockerfile-dist +++ b/tests/Dockerfile-dist @@ -1,22 +1,24 @@ #syntax=docker/dockerfile:1.2 -ARG ARCHTAG - -FROM docker.io/library/archlinux:base-devel$ARCHTAG +FROM docker.io/library/archlinux:base ARG RUNTIME_DEPS ARG BUILD_DEPS # Freshen all base system packages -RUN pacman-key --init -RUN pacman --needed --noconfirm -Syq archlinux-keyring -RUN pacman --needed --noconfirm -Suq +RUN pacman --needed --noconfirm -Syuq # Install build and run-time dependencies RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS $BUILD_DEPS # Remove autotools, building the source distributions should not require them -RUN pacman --noconfirm -Rn autoconf automake libtool base-devel +RUN pacman --noconfirm -Rn autoconf automake libtool base-devel hwloc onetbb clang mold + +# Setup LuaRocks for use with LuaJIT roughly matching SILE's internal VM +RUN luarocks config lua_version 5.1 && \ + luarocks config lua_interpreter luajit && \ + luarocks config variables.LUA "$(command -v luajit)" && \ + luarocks config variables.LUA_INCDIR /usr/include/luajit-2.1/ # Set at build time, forces Docker’s layer caching to reset at this point ARG VERSION @@ -24,7 +26,11 @@ ARG VERSION COPY ./sile-$VERSION /src WORKDIR /src -RUN ./configure --with-system-lua-sources --without-manual +RUN ./configure \ + --disable-embeded-resources \ + --with-system-lua-sources \ + --without-system-luarocks \ + --without-manual RUN make RUN make install From ef0736160d4336355dabbc93f5a0ba2c83820ccb Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sun, 29 Sep 2024 01:35:38 +0300 Subject: [PATCH 18/23] chore(docker): Disable pointless asset embeding in containers --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4892e935d..e576834ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,7 +64,11 @@ RUN build-aux/docker-bootstrap.sh ENV RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=mold" RUN ./bootstrap.sh -RUN ./configure --mandir='$prefix}/man' --with-system-lua-sources --without-system-luarocks --without-manual +RUN ./configure \ + --disable-embeded-resources \ + --with-system-lua-sources \ + --without-system-luarocks \ + --without-manual RUN make RUN make install DESTDIR=/pkgdir From ecc913d1d1f73e7fc5f658cc82b49035e83c37c3 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Mon, 30 Sep 2024 14:13:34 +0300 Subject: [PATCH 19/23] docs(cli): Copy-edit main description to appease linter *and* read better --- sile-lua.1.in | 11 ++++++++--- src/cli.rs | 16 +++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sile-lua.1.in b/sile-lua.1.in index b5375705a..b48e9191c 100644 --- a/sile-lua.1.in +++ b/sile-lua.1.in @@ -6,9 +6,14 @@ .B [\fIoptions\fR] .B [\fIINPUT\fR] .SH DESCRIPTION -The SILE typesetter reads an input file(s), by default in either SIL or XML format, and processes them to generate an output file, by default in PDF format. -The output will be written to a file with the same name as the first input file with the extension changed to .pdf unless the \fB\-\-output\fR argument is used. -Additional input or output formats can be handled by loading a module with the \fB\-\-use\fR argument to add support for them first. +The SILE Typesetter reads input file(s) and typesets the content into a rendered documument format, typically PDF. +.LP +By default, input files may be in declarative SIL markup, structured XML, or programatic Lua. +The input format is automatically detected by the active modules. +By default, the output will be a file with the same name as the first input file with the extension changed to .pdf. +The output filename can be overridden with the \fB\-\-output\fR argument. +Using \fB\-\-backend\fR one can change to a different output format (or a different driver for the same format). +Additional input or output formats can be handled by loading a 3rd party module that supports them by adding \fB\-\-use\fR argument on the command line (which will load prior to attempting to read input documents). .SH OPTIONS .TP .BR \-b ", " \-\-backend= \fIvalue\fR diff --git a/src/cli.rs b/src/cli.rs index 9af8b7142..f4baa1590 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1,11 +1,17 @@ use clap::Parser; use std::path::PathBuf; -/// The SILE typesetter reads an input file(s), by default in either SIL or XML format, and -/// processes them to generate an output file, by default in PDF format. The output will be written -/// to a file with the same name as the first input file with the extension changed to .pdf unless -/// the `--output` argument is used. Additional input or output formats can be handled by loading -/// a module with the `--use` argument to add support for them first. +/// The SILE Typesetter reads input file(s) and typesets the content into a rendered documument +/// format, typically PDF. +/// +/// By default, input files may be in declarative SIL markup, structured XML, or programatic Lua. +/// The input format is automatically detected by the active modules. By default, the output will +/// be a file with the same name as the first input file with the extension changed to .pdf. The +/// output filename can be overridden with the `--output` argument. Using `--backend` one can +/// change to a different output format (or a different driver for the same format). Additional +/// input or output formats can be handled by loading a 3rd party module that supports them by +/// adding `--use` argument on the command line (which will load prior to attempting to read input +/// documents). #[derive(Parser, Debug)] #[clap(author, name = "SILE", bin_name = "sile")] pub struct Cli { From 4fbb6c01df87c363373a636e0a73e9639f53d130 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Mon, 30 Sep 2024 14:35:31 +0300 Subject: [PATCH 20/23] fix(core): Correct module load paths when building in developer mode --- core/pathsetup.lua.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pathsetup.lua.in b/core/pathsetup.lua.in index 30d69e41f..9dff27a01 100644 --- a/core/pathsetup.lua.in +++ b/core/pathsetup.lua.in @@ -67,7 +67,7 @@ local function extendPaths (path, silesourcedir) prependPath(path .. "/sile") end -- These paths are *only* used in developer mode for build testing - if "@DEVELOPER_FALSE@" ~= "" then -- see ./configure --(en|dis)able-developer + if "@DEVELOPER_MODE_TRUE@" == "" then -- see ./configure --(en|dis)able-developer-mode prependCPath(path .. "/libtexpdf/.libs") prependCPath(path .. "/justenough/.libs") end From 33703dba233d007dfa17e01e846726655548cf18 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 1 Oct 2024 00:34:12 +0300 Subject: [PATCH 21/23] chore(deps): Bump pinned versions of patch level crate updates --- Cargo.lock | 151 ++++++++++++++++++++++++++++------------------------- 1 file changed, 80 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9cc343c7..3c9c09367 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arc-swap" @@ -98,9 +98,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "3bbb537bb4a30b90362caddba8f360c0a56bc13d3a5570028e7197204cb54a17" dependencies = [ "shlex", ] @@ -183,9 +183,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.16" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -193,9 +193,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -206,23 +206,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.24" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" +checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -307,9 +307,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -400,9 +400,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -741,7 +741,7 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -803,9 +803,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.10" +version = "0.10.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d5b8722112fa2fa87135298780bc833b0e9f6c56cc82795d209804b3a03484" +checksum = "ebfc4febd088abdcbc9f1246896e57e37b7a34f6909840045a1767c6dafac7af" dependencies = [ "bstr", "gix-trace", @@ -921,9 +921,9 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" +checksum = "6cae0e8661c3ff92688ce1c8b8058b3efb312aba9492bbe93661a21705ab431b" [[package]] name = "gix-traverse" @@ -978,9 +978,9 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -1061,9 +1061,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libredox" @@ -1125,9 +1125,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -1157,9 +1157,9 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab7a5b4756b8177a2dfa8e0bbcde63bd4000afbc4ab20cbb68d114a25470f29" +checksum = "ebe026d6bd1583a9cf9080e189030ddaea7e6f5f0deb366a8e26f8a26c4135b8" dependencies = [ "cc", "cfg-if", @@ -1180,7 +1180,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -1209,9 +1209,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "parking_lot" @@ -1244,9 +1247,15 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -1304,18 +1313,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -1325,9 +1334,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1336,9 +1345,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "roff" @@ -1366,7 +1375,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.76", + "syn 2.0.79", "walkdir", ] @@ -1389,9 +1398,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -1438,29 +1447,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -1548,9 +1557,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -1559,9 +1568,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -1582,22 +1591,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] [[package]] @@ -1668,15 +1677,15 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -1900,9 +1909,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -1930,5 +1939,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.79", ] From 055a68e740415d9ecd5439c3b328274bd4ed892e Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 1 Oct 2024 00:53:42 +0300 Subject: [PATCH 22/23] chore(deps): Upgrade mlua to beta release of v0.10 --- Cargo.lock | 14 +++++++------- Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c9c09367..20e397a5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1046,9 +1046,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1143,15 +1143,15 @@ dependencies = [ [[package]] name = "mlua" -version = "0.9.9" +version = "0.10.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d111deb18a9c9bd33e1541309f4742523bfab01d276bfa9a27519f6de9c11dc7" +checksum = "200dd4c8e5f81416d43a023b9921c3cbf01d828094b23a90b26826c3840ba4f3" dependencies = [ "bstr", "mlua-sys", "mlua_derive", "num-traits", - "once_cell", + "parking_lot", "rustc-hash", ] @@ -1170,9 +1170,9 @@ dependencies = [ [[package]] name = "mlua_derive" -version = "0.9.3" +version = "0.10.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09697a6cec88e7f58a02c7ab5c18c611c6907c8654613df9cc0192658a4fb859" +checksum = "13e6f40fa1fd8426285688f4a37b56beac69284743d057ee6db352b543f4b621" dependencies = [ "itertools", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index c26c94cf0..fc3cdb2ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ optional = true features = [ "derive", "string", "wrap_help" ] [dependencies.mlua] -version = "0.9" +version = "0.10.0-beta.2" features = [ "macros" ] [dependencies.rust-embed] From b9716f00744a3ffa847285a2625feabcbbe67753 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 1 Oct 2024 00:59:35 +0300 Subject: [PATCH 23/23] refactor(cli): Update Lua VM usage with improved generic handling --- src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index dc7e48fb4..0c8254be8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -60,7 +60,7 @@ pub fn inject_version(lua: &Lua) { pub fn load_sile(lua: &Lua) { let entry: LuaString = lua.create_string("core.sile").unwrap(); let require: LuaFunction = lua.globals().get("require").unwrap(); - require.call::(entry).unwrap(); + require.call::(entry).unwrap(); } pub fn version() -> crate::Result { @@ -153,7 +153,7 @@ pub fn run( eprintln!("{full_version}"); } let init: LuaFunction = sile.get("init")?; - init.call::<_, ()>(())?; + init.call::(())?; if let Some(inputs) = inputs { let input_filenames: LuaTable = lua.create_table()?; for input in inputs.iter() { @@ -175,20 +175,20 @@ pub fn run( let spec = spec?; let module: LuaString = spec.get("module")?; let options: LuaTable = spec.get("options")?; - r#use.call::<(LuaString, LuaTable), ()>((module, options))?; + r#use.call::<(LuaString, LuaTable)>((module, options))?; } let input_filenames: LuaTable = sile_input.get("filenames")?; let process_file: LuaFunction = sile.get("processFile")?; for file in input_filenames.sequence_values::() { - process_file.call::(file?)?; + process_file.call::(file?)?; } let finish: LuaFunction = sile.get("finish")?; - finish.call::<_, ()>(())?; + finish.call::(())?; } else { let repl_module: LuaString = lua.create_string("core.repl")?; let require: LuaFunction = lua.globals().get("require")?; - let repl: LuaTable = require.call::(repl_module)?; - repl.call_method::<_, ()>("enter", ())?; + let repl: LuaTable = require.call::(repl_module)?; + repl.call_method::("enter", ())?; } Ok(()) }