diff --git a/.cirrus.yml b/.cirrus.yml index cb2e32861..61d6ab423 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -41,11 +41,16 @@ task: - git fetch --prune --tags ||: - ./bootstrap.sh configure_script: | - ./configure MAKE=gmake \ - --enable-developer-mode LDOC=false LUAROCKS=false LUACHECK=false BUSTED=false DELTA=cat PDFINFO=false NIX=false NPM=false DOCKER=false STYLUA=false TYPOS=false \ + ./configure \ + DOCKER=false \ + MAKE=gmake \ + PDFINFO=false \ + --enable-developer-mode \ + --without-developer-tools \ --disable-font-variations \ --with-system-lua-sources \ --with-system-luarocks \ + --with-luarocks=luarocks51 \ --without-manual make_script: - gmake all diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 742ae8318..04a1a9f79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: ./bootstrap.sh ./configure \ --enable-developer-mode \ - BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat \ + --without-developer-tools \ --disable-font-variations \ --with-manual \ ${{ matrix.configuration[1] }} @@ -113,8 +113,11 @@ jobs: run: | ./bootstrap.sh ./configure \ + FCMATCH=true \ + PDFINFO=false \ --enable-developer-mode \ - BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat FCMATCH=true PDFINFO=false CARGO=true \ + --without-developer-tools \ + DOCKER=$(which docker) \ --disable-font-variations \ --with-system-lua-sources \ --without-manual @@ -144,7 +147,7 @@ jobs: .sources key: fonts-${{ hashFiles('Makefile-fonts') }} - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v15 + uses: DeterminateSystems/nix-installer-action@v16 - name: Cache Nix dependencies uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Setup developer environment diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c13962ee0..9653ead3e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -60,7 +60,9 @@ jobs: run: | ./bootstrap.sh ./configure \ - --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \ + --enable-developer-mode \ + --without-developer-tools \ + BUSTED=$(which busted) \ --disable-font-variations \ --without-manual - name: Make diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 120557708..26c664348 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -30,20 +30,14 @@ jobs: echo "REF=${GITHUB_REF##refs/*/}" >> $GITHUB_ENV ./bootstrap.sh ./configure \ + BSDTAR=false \ + FCMATCH=true \ + PDFINFO=false \ --enable-developer-mode \ + --without-developer-tools \ + DOCKER=$(which docker) \ --without-harfbuzz \ - --disable-font-variations \ - BSDTAR=false \ - BUSTED=false \ - DELTA=false \ - FCMATCH=true \ - LDOC=false \ - LUACHECK=false \ - LUAROCKS=false \ - NIX=false \ - PDFINFO=false \ - STYLUA=false \ - TYPOS=false + --disable-font-variations - name: Publish Docker Image to GH Container Registry run: | make docker-build-push diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index b3c0e2c2d..0d884eee4 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@v15 + uses: DeterminateSystems/nix-installer-action@v16 - name: Cache Nix dependencies uses: DeterminateSystems/magic-nix-cache-action@v8 # Upstream package sometimes has flags set that disable flake checking diff --git a/.github/workflows/stylua.yml b/.github/workflows/stylua.yml index 4789ca225..fe3ac9fca 100644 --- a/.github/workflows/stylua.yml +++ b/.github/workflows/stylua.yml @@ -1,6 +1,6 @@ name: StyLua -on: [ workflow_dispatch ] +on: [ push, pull_request ] jobs: @@ -9,8 +9,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - uses: JohnnyMorganz/stylua-action@v4 + - name: StyLua + uses: JohnnyMorganz/stylua-action@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - version: latest + version: 2.0.0 args: --check --respect-ignores -g '*.lua' -g '*.lua.in' -g '*.rockspec.in' .busted .luacov .luacheckrc build-aux/config.ld . diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1a6ba5bd8..c1b341294 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,7 +71,9 @@ jobs: ./bootstrap.sh ./configure \ ${{ matrix.luaVersion[1] }} \ - --enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \ + --enable-developer-mode \ + --without-developer-tools \ + BUSTED=$(which busted) \ --disable-font-variations \ --with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \ --without-system-luarocks \ diff --git a/Cargo.lock b/Cargo.lock index 04309d132..78d768ad2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1496,7 +1496,7 @@ checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "rusile" -version = "0.15.5" +version = "0.15.6" dependencies = [ "mlua", "sile", diff --git a/Cargo.toml b/Cargo.toml index c98d63ce7..36def3052 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,25 +1,3 @@ -[workspace] -resolver = "2" -members = [ ".", "rusile" ] - - [workspace.package] - version = "0.15.5" - edition = "2021" - rust-version = "1.71.0" - authors = [ - "Simon Cozens", - "Caleb Maclennan ", - "Olivier Nicole", - "Didier Willis" -] - homepage = "https://sile-typesetter.org" - repository = "https://github.com/sile-typesetter/sile" - license = "MIT" - -[workspace.dependencies.mlua] -version = "0.10" -features = [ "anyhow" ] - [package] name = "sile" description = "Simon’s Improved Layout Engine" @@ -27,122 +5,92 @@ readme = "README.md" build = "build-aux/build.rs" version = "0.15.6" - [package.edition] - workspace = true - - [package.rust-version] - workspace = true - - [package.authors] - workspace = true +[workspace.package] +version = "0.15.6" +edition = "2021" +rust-version = "1.71.0" +authors = [ + "Simon Cozens", + "Caleb Maclennan ", + "Olivier Nicole", + "Didier Willis", +] +homepage = "https://sile-typesetter.org" +repository = "https://github.com/sile-typesetter/sile" +license = "MIT" - [package.homepage] - workspace = true +[workspace] +resolver = "2" +members = [".", "rusile"] - [package.repository] - workspace = true +[package.edition] +workspace = true - [package.license] - workspace = true +[package.rust-version] +workspace = true -[package.metadata.bacon.jobs] -cmd = [ "cargo", "build", "--color", "always" ] +[package.authors] +workspace = true -[package.metadata.typos.default] -locale = "en-us" -extend-ignore-re = [ - "(?s)(#|//|--|%)\\s*typos: ignore start.*?\\n\\s*(#|//|--|%)\\s*typos: ignore end" -] -extend-ignore-identifiers-re = [ - "[a-f0-9]{7}", - "^.{2,3}$", - "^twords?", - "[Pp]arms", - "wdth", - "0fpt", - "^ot", - "^hb_ot", - "^HB_", - "^Tyre$", - "PoDoFo", - "_Flate", - "pointint", - "DEPENDEES", - "EPdf", - "FileAttachement" -] +[package.homepage] +workspace = true - [package.metadata.typos.default.extend-words] - beveled = "bevelled" - bevelled = "bevelled" - craters = "creators" - neet = "need" +[package.repository] +workspace = true -[package.metadata.typos.files] -ignore-hidden = false -extend-exclude = [ - "/.git", - "CHANGELOG.md", - "build-aux/ax*", - "languages/*/hyphens*", - "lua-libraries/*", - "lua_modules/*", - "node_modules/*", - "tests/*.expected", - "cmake/*.diff", - "libtexpdf" -] +[package.license] +workspace = true [[bin]] name = "sile" -required-features = [ "cli" ] - -[features] -default = [ - "cli", - "bash", - "elvish", - "fish", - "manpage", - "powershell", - "zsh" -] -lua54 = [ "mlua/lua54" ] -lua53 = [ "mlua/lua53" ] -lua52 = [ "mlua/lua52" ] -lua51 = [ "mlua/lua51" ] -luajit = [ "mlua/luajit" ] -vendored = [ "mlua/vendored" ] -static = [ "rust-embed" ] -variations = [ ] -completions = [ "cli", "clap_complete" ] -cli = [ "clap" ] -bash = [ "completions" ] -elvish = [ "completions" ] -fish = [ "completions" ] -manpage = [ "clap_mangen" ] -powershell = [ "completions" ] -zsh = [ "completions" ] +required-features = ["cli"] [profile.release] lto = true +[features] +default = ["cli", "bash", "elvish", "fish", "manpage", "powershell", "zsh"] +lua54 = ["mlua/lua54"] +lua53 = ["mlua/lua53"] +lua52 = ["mlua/lua52"] +lua51 = ["mlua/lua51"] +luajit = ["mlua/luajit"] +vendored = ["mlua/vendored"] +static = ["rust-embed"] +variations = [] +completions = ["cli", "clap_complete"] +cli = ["clap"] +bash = ["completions"] +elvish = ["completions"] +fish = ["completions"] +manpage = ["clap_mangen"] +powershell = ["completions"] +zsh = ["completions"] + +[workspace.dependencies.mlua] +version = "0.10" +features = ["anyhow"] + +[workspace.dependencies.sile] +path = "." +version = "0.15.6" + [dependencies.anyhow] version = "1.0" [dependencies.clap] version = "4.4" optional = true -features = [ "derive", "string", "wrap_help" ] +features = ["derive", "string", "wrap_help"] [dependencies.mlua] workspace = true -features = [ "macros" ] +features = ["macros"] [dependencies.rust-embed] version = "8.0" optional = true -features = [ "include-exclude" ] +features = ["include-exclude"] [dependencies.harfbuzz-sys] version = "0.5" @@ -162,12 +110,57 @@ optional = true [build-dependencies.clap] version = "4.4" optional = true -features = [ "derive" ] +features = ["derive"] [build-dependencies.vergen] version = "8.2" default-features = false -features = [ "build", "cargo", "git", "gitoxide" ] +features = ["build", "cargo", "git", "gitoxide"] [package.metadata.docs.rs] -features = [ "luajit", "vendored" ] +features = ["luajit", "vendored"] + +[package.metadata.typos.default] +locale = "en-us" +extend-ignore-re = [ + "(?s)(#|//|--|%)\\s*typos: ignore start.*?\\n\\s*(#|//|--|%)\\s*typos: ignore end", +] +extend-ignore-identifiers-re = [ + "[a-f0-9]{7}", + "^.{2,3}$", + "^twords?", + "[Pp]arms", + "wdth", + "0fpt", + "^ot", + "^hb_ot", + "^HB_", + "^Tyre$", + "PoDoFo", + "_Flate", + "pointint", + "DEPENDEES", + "EPdf", + "FileAttachement", +] + +[package.metadata.typos.default.extend-words] +beveled = "bevelled" +bevelled = "bevelled" +craters = "creators" +neet = "need" + +[package.metadata.typos.files] +ignore-hidden = false +extend-exclude = [ + "/.git", + "CHANGELOG.md", + "build-aux/ax*", + "languages/*/hyphens*", + "lua-libraries/*", + "lua_modules/*", + "node_modules/*", + "tests/*.expected", + "cmake/*.diff", + "libtexpdf", +] diff --git a/Makefile.am b/Makefile.am index bbccb0eae..a5fc43102 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I build-aux -AM_DISTCHECK_CONFIGURE_FLAGS = --enable-developer-mode +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-developer-mode --without-developer-tools PDFINFO=$(PDFINFO) .ONESHELL: .SECONDARY: @@ -216,7 +216,7 @@ sile-$(VERSION).pdf: $(MANUAL) sile-%.md: CHANGELOG.md $(SED) -e '/\.\.\.v$*/,/\.\.\.v/!d' CHANGELOG.md | \ $(SED) -e '1,3d;N;$$!P;$$!D;$$d' | - $(or $(filter cat,$(TYPOS)),$(TYPOS) --write-changes -) > $@ + $(if $(TYPOS),$(TYPOS) --write-changes,cat) - > $@ check: selfcheck diff --git a/build-aux/ax_lua.m4 b/build-aux/ax_lua.m4 index 4e82e454e..ebd0182e6 100644 --- a/build-aux/ax_lua.m4 +++ b/build-aux/ax_lua.m4 @@ -57,15 +57,15 @@ # version number greater or equal to MINIMUM-VERSION and less than # TOO-BIG-VERSION will be accepted. # -# Optionally, the fifth argument ENABLE_LUAJIT can be set to control whether -# LuaJIT or PUC Lua should be considered during discovery. An empty value or +# Optionally, the fifth argument ENABLE_LUAJIT can be set to control +# whether LuaJIT or PUC Lua should be considered. An empty empty value or # 'never' means only PUC Lua installations will be considered; a value of # 'always' means PUC is not even considered and only LuaJIT is discovered; -# 'prefer' means LuaJIT should be used if found but allow PUC , and finally -# 'allow' means it should not be chosen if any PUC Lua version is found but -# it could be used as a last resort. For 'default' and 'allow' a new -# configure flag will be provided to the user --with-luajit with the default -# option being either 'yes' or 'no' respectively. +# 'prefer' means LuaJIT should be used if found but allow PUC, and finally +# 'allow' means it should not be chosen if any PUC Lua version is found +# but it could be used as a last resort. For 'default' and 'allow' a new +# configure flag will be provided to the user --with-luajit with the +# default option being either 'yes' or 'no' respectively. # # The Lua version number, LUA_VERSION, is found from the interpreter, and # substituted. LUA_PLATFORM is also found, but not currently supported (no @@ -198,7 +198,7 @@ dnl ========================================================================= dnl AX_PROG_LUA([MINIMUM-VERSION], [TOO-BIG-VERSION], -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND] +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], dnl [ENABLE_LUAJIT]) dnl ========================================================================= AC_DEFUN([AX_PROG_LUA], @@ -210,29 +210,31 @@ AC_DEFUN([AX_PROG_LUA], dnl Make LUA a precious variable. AC_ARG_VAR([LUA], [The Lua interpreter, e.g. /usr/bin/lua5.1]) - dnl Figure out whether we should expose LuaJIT as a user facing configure flag - AS_CASE(["m4_default([$5], [never])"], - [never], [ default_luajit=no; with_luajit=no ], - [always], [ default_luajit=yes; with_luajit=yes ], + dnl Figure out whether we should expose LuaJIT as a user facing configure + dnl flag and if so whether the default option should be with or without. + m4_case(m4_default([$5], [never]), + [never], [ + with_luajit=no + ], + [always], [ + with_luajit=yes + ], [allow], [ - default_luajit=no - m4_if([$5], [allow], [ - AC_ARG_WITH([luajit], - [AS_HELP_STRING([--with-luajit], - [prefer LuaJIT over PUC Lua, even if the latter is newer])]) - ]) + AC_ARG_WITH([luajit], + [AS_HELP_STRING([--with-luajit], + [prefer LuaJIT over PUC Lua, even if the latter is newer])]) test "x$with_luajit" != 'xyes' && with_luajit=no ], [prefer], [ - default_luajit=yes - m4_if([$5], [prefer], [ - AC_ARG_WITH([luajit], - [AS_HELP_STRING([--without-luajit], - [prefer PUC Lua over LuaJIT])]) - ]) + AC_ARG_WITH([luajit], + [AS_HELP_STRING([--without-luajit], + [prefer PUC Lua over LuaJIT])]) test "x$with_luajit" != 'xno' && with_luajit=yes ], - [AC_MSG_ERROR([Unrecognized value for ENABLE_LUAJIT])]) + [ + AC_MSG_ERROR([Unrecognized value for ENABLE_LUAJIT]) + ] + ) AM_CONDITIONAL([LUAJIT], [test "x$with_luajit" == "xyes"]) dnl Find a Lua interpreter. @@ -401,7 +403,11 @@ AC_DEFUN([AX_PROG_LUA], ]) dnl AX_WITH_LUA is now the same thing as AX_PROG_LUA. -AU_DEFUN([AX_WITH_LUA], [AX_PROG_LUA], [$0 is deprecated, please use AX_PROG_LUA instead]) +AC_DEFUN([AX_WITH_LUA], +[ + AC_MSG_WARN([[$0 is deprecated, please use AX_PROG_LUA instead]]) + AX_PROG_LUA +]) dnl ========================================================================= diff --git a/build-aux/ax_lua_module.m4 b/build-aux/ax_lua_module.m4 index ef4b2e57b..3d1f74ea5 100644 --- a/build-aux/ax_lua_module.m4 +++ b/build-aux/ax_lua_module.m4 @@ -1,15 +1,53 @@ -#serial 0 - -AC_DEFUN([AX_LUA_MODULE], -[ - AX_PROG_LUA([5.1], [], [], [], [prefer]) - AC_MSG_CHECKING([whether Lua can load module $1]) - AS_IF([$LUA -e 'require("$1")' 2>/dev/null], [ - AC_MSG_RESULT([loaded]) - $3 - ], [ - AC_MSG_RESULT([unable to load]) - m4_default([$4], [AC_MSG_ERROR([cannot find Lua library $1 - install from luarocks package $2])]) - ]) +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lua_module.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LUA_MODULE([ROCKNAME], [MODULE]) +# +# DESCRIPTION +# +# Tests the availability of a Lua module using both available mechanisms, +# first checking if a Lua Rock manifest is available, and if not falling +# back to attempting to load a module directly. +# +# If the module name is the same as the rock name, the second argument can +# be ommitted. +# +# Example usage: +# +# AX_LUA_MODULE([ssl], [luasec]) +# +# Note: under the hood this uses AX_LUAROCKS_ROCK and AX_LUA_REQUIRE. +# +# LICENSE +# +# Copyright (c) 2024 Caleb Maclennan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_LUA_MODULE],[ + pushdef([ROCKNAME],$1) + pushdef([MODULE],m4_default($2,$1)) + pushdef([VARIABLE],LUA_HAS_[]m4_toupper(m4_translit($1,-.,__))) + + AC_ARG_VAR(VARIABLE,Was Lua module found) + + AS_IF(test -z "$VARIABLE",[ + AX_LUAROCKS_ROCK(ROCKNAME,[VARIABLE=yes],[VARIABLE=no]) + AS_IF([test "x$VARIABLE" != xyes],[ + AX_LUA_REQUIRE(MODULE,[VARIABLE=yes]) + ]) + ]) + + popdef([ROCKNAME]) + popdef([MODULE]) ]) + diff --git a/build-aux/ax_lua_require.m4 b/build-aux/ax_lua_require.m4 new file mode 100644 index 000000000..8aebb1d1f --- /dev/null +++ b/build-aux/ax_lua_require.m4 @@ -0,0 +1,65 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lua_require.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LUA_REQUIRE([MODULE], [ACTION_IF_FOUND], [ACTION_IF_NOT_FOUND]) +# +# DESCRIPTION +# +# Tests whether Lua can load a module, fails if it is not loadable. +# +# Example usage: +# +# AX_LUA_REQUIRE(lpeg) +# +# Note: this is an alternative to AX_LUAROCKS_ROCK which queries the +# LuaRocks manifest for whether something is installed. Sometimes a +# proper manifest is not available, and this tests whether a given +# module name is actually loadable. +# +# It can also be useful to test for libraries that may or may not be +# built into Lua VMs. Builtin modules will return a success. +# +# LICENSE +# +# Copyright (c) 2024 Caleb Maclennan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_LUA_REQUIRE],[ + # Make sure we have a Lua interpreter + if test -z "$LUA"; then + AX_PROG_LUA + if test -z "$LUA"; then + AC_MSG_ERROR([No Lua VM set]) + fi + fi + + AC_PREREQ([2.61]) + + pushdef([MODULE],$1) + pushdef([ACTION_IF_FOUND],$2) + pushdef([ACTION_IF_NOT_FOUND],$3) + + AC_MSG_CHECKING([whether Lua can load module MODULE]) + AS_IF([$LUA -e 'require("MODULE")' 2>/dev/null], [ + AC_MSG_RESULT([loaded]) + ACTION_IF_FOUND + ], [ + AC_MSG_RESULT([unable to load]) + m4_ifset([ACTION_IF_NOT_FOUND][ACTION_IF_NOT_FOUND], + [AC_MSG_FAILURE([cannot find Lua module MODULE])]) + ]) + + popdef([MODULE]) + popdef([ACTION_IF_FOUND]) + popdef([ACTION_IF_NOT_FOUND]) +]) + diff --git a/build-aux/ax_luarocks_rock.m4 b/build-aux/ax_luarocks_rock.m4 new file mode 100644 index 000000000..3e98700f7 --- /dev/null +++ b/build-aux/ax_luarocks_rock.m4 @@ -0,0 +1,62 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_luarocks_rock.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LUAROCKS_ROCK([ROCKNAME], [ACTION_IF_FOUND], [ACTION_IF_NOT_FOUND]) +# +# DESCRIPTION +# +# Checks for a rock, and fails if it is not installed. +# +# Example usage: +# +# AX_LUAROCKS_ROCK(stdlib) +# +# Note: use of this macro is not normally recommended. Normally, LuaRocks +# should be used to drive the build system, and it takes care of rock +# dependencies. Use this macro only if LuaRocks cannot be used at the top +# level, for example, in a build system that uses Lua only incidentally. +# +# LICENSE +# +# Copyright (c) 2024 Caleb Maclennan +# Copyright (c) 2016 Reuben Thomas +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_LUAROCKS_ROCK],[ + # Make sure we have luarocks + if test -z "$LUAROCKS"; then + AX_WITH_PROG(LUAROCKS,luarocks) + if test -z "$LUAROCKS"; then + AC_MSG_ERROR([can't find luarocks]) + fi + fi + + AC_PREREQ([2.61]) + + pushdef([ROCKNAME],$1) + pushdef([ACTION_IF_FOUND],$2) + pushdef([ACTION_IF_NOT_FOUND],$3) + + AC_MSG_CHECKING(whether LuaRock ROCKNAME is installed) + AS_IF(["$LUAROCKS"${LUA_VERSION+ --lua-version $LUA_VERSION} show ROCKNAME > /dev/null 2>&1],[ + AC_MSG_RESULT(yes) + ACTION_IF_FOUND + ],[ + AC_MSG_RESULT(no) + m4_ifset([ACTION_IF_NOT_FOUND],[ACTION_IF_NOT_FOUND], + [AC_MSG_FAILURE([LuaRock ROCKNAME not found])]) + ]) + + popdef([ROCKNAME]) + popdef([ACTION_IF_FOUND]) + popdef([ACTION_IF_NOT_FOUND]) +]) diff --git a/build-aux/ax_with_prog.m4 b/build-aux/ax_with_prog.m4 new file mode 100644 index 000000000..b3a881c0d --- /dev/null +++ b/build-aux/ax_with_prog.m4 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_prog.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_PROG([VARIABLE],[program],[VALUE-IF-NOT-FOUND],[PATH]) +# +# DESCRIPTION +# +# Locates an installed program binary, placing the result in the precious +# variable VARIABLE. Accepts a present VARIABLE, then --with-program, and +# failing that searches for program in the given path (which defaults to +# the system path). If program is found, VARIABLE is set to the full path +# of the binary; if it is not found VARIABLE is set to VALUE-IF-NOT-FOUND +# if provided, unchanged otherwise. +# +# A typical example could be the following one: +# +# AX_WITH_PROG(PERL,perl) +# +# NOTE: This macro is based upon the original AX_WITH_PYTHON macro from +# Dustin J. Mitchell . +# +# LICENSE +# +# Copyright (c) 2008 Francesco Salvestrini +# Copyright (c) 2008 Dustin J. Mitchell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 17 + +AC_DEFUN([AX_WITH_PROG],[ + AC_PREREQ([2.61]) + + pushdef([VARIABLE],$1) + pushdef([EXECUTABLE],$2) + pushdef([VALUE_IF_NOT_FOUND],$3) + pushdef([PATH_PROG],$4) + + AC_ARG_VAR(VARIABLE,Absolute path to EXECUTABLE executable) + + AS_IF(test -z "$VARIABLE",[ + AC_MSG_CHECKING(whether EXECUTABLE executable path has been provided) + AC_ARG_WITH(EXECUTABLE,AS_HELP_STRING([--with-EXECUTABLE=[[[PATH]]]],absolute path to EXECUTABLE executable), [ + AS_IF([test "$withval" != yes && test "$withval" != no],[ + VARIABLE="$withval" + AC_MSG_RESULT($VARIABLE) + ],[ + VARIABLE="" + AC_MSG_RESULT([no]) + AS_IF([test "$withval" != no], [ + AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) + ]) + ]) + ],[ + AC_MSG_RESULT([no]) + AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) + ]) + ]) + + popdef([PATH_PROG]) + popdef([VALUE_IF_NOT_FOUND]) + popdef([EXECUTABLE]) + popdef([VARIABLE]) +]) diff --git a/build-aux/cargo-updater.js b/build-aux/cargo-updater.js index 1b64fda44..f91b9074e 100644 --- a/build-aux/cargo-updater.js +++ b/build-aux/cargo-updater.js @@ -1,4 +1,5 @@ const TOML = require('@iarna/toml') +const { exec } = require('node:child_process') module.exports.readVersion = function (contents) { const data = TOML.parse(contents) @@ -6,7 +7,11 @@ module.exports.readVersion = function (contents) { } module.exports.writeVersion = function (contents, version) { - const data = TOML.parse(contents) - data.package.version = version - return TOML.stringify(data) + exec('cargo-set-version set-version ' + version, (err, output) => { + if (err) { + console.error("Could not run Cargo subcommand to set version: ", err) + return + } + }) + return contents } diff --git a/build-aux/pkg.nix b/build-aux/pkg.nix index 91734bd97..6b9fd535e 100644 --- a/build-aux/pkg.nix +++ b/build-aux/pkg.nix @@ -18,12 +18,14 @@ rustPlatform, # buildInputs + cargo-edit, lua, harfbuzz, icu, fontconfig, libiconv, stylua, + taplo, typos, darwin, # FONTCONFIG_FILE @@ -43,6 +45,10 @@ let ps: with ps; [ + # used for module detection, also recommended at runtime for 3rd party module installation + luarocks + + # modules used at runtime cassowary cldr fluent @@ -113,12 +119,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ + cargo-edit luaEnv harfbuzz icu fontconfig libiconv stylua + taplo typos ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/build-aux/que_developer_mode.m4 b/build-aux/que_developer_mode.m4 index 18bd29fe8..f1bfeafdc 100644 --- a/build-aux/que_developer_mode.m4 +++ b/build-aux/que_developer_mode.m4 @@ -15,5 +15,12 @@ AC_DEFUN([QUE_DEVELOPER_MODE], [ [USE_DEVELOPER_MODE=]m4_if(_que_developer_def, [enable], [no], [yes])) AC_MSG_RESULT([$USE_DEVELOPER_MODE]) AM_CONDITIONAL([DEVELOPER_MODE], [test $USE_DEVELOPER_MODE = yes]) - + AM_COND_IF([DEVELOPER_MODE], [ + AC_ARG_WITH([developer-tools], + AS_HELP_STRING([--without-developer-tools], + [Avoid checks for developer workflow tooling])) + ], [ + with_developer_tools=no + ]) + AM_CONDITIONAL([DEVELOPER_TOOLS], [test "x$with_developer_tools" != "xno"]) ]) diff --git a/build-aux/que_font.m4 b/build-aux/que_font.m4 index 57db8a4fe..9599b3940 100644 --- a/build-aux/que_font.m4 +++ b/build-aux/que_font.m4 @@ -3,7 +3,7 @@ AC_DEFUN([QUE_FONT], [ if test -z "$FCMATCH"; then AC_PATH_PROG(FCMATCH, fc-match) if test -z "$FCMATCH"; then - AC_MSG_ERROR([can't find fc-match]) + AC_MSG_ERROR([can't find fc-match]) fi fi pushdef([FONT],$1) diff --git a/build-aux/que_progvar.m4 b/build-aux/que_progvar.m4 index 20d1288b4..043a93758 100644 --- a/build-aux/que_progvar.m4 +++ b/build-aux/que_progvar.m4 @@ -1,5 +1,11 @@ AC_DEFUN([QUE_PROGVAR], [ - test -n "$m4_toupper($1)" || { AC_PATH_PROG(m4_toupper($1), m4_default($2,$1)) } - test -n "$m4_toupper($1)" || AC_MSG_ERROR([m4_default($2,$1) is required]) + pushdef([VARIABLE],m4_toupper($1)) + pushdef([EXECUTABLE],m4_default($2,$1)) + AX_WITH_PROG(VARIABLE,EXECUTABLE) + AS_IF([test "x$with_$1" != xno && test -z "$VARIABLE"], [ + AC_MSG_ERROR([EXECUTABLE is required]) + ]) + popdef([EXECUTABLE]) + popdef([VARIABLE]) ]) diff --git a/classes/book.lua b/classes/book.lua index 13aa4e4f9..0b7fbbf52 100644 --- a/classes/book.lua +++ b/classes/book.lua @@ -256,20 +256,15 @@ function class:registerCommands () end, "Begin a new subsection") self:registerCommand("book:chapterfont", function (_, content) - SILE.settings:temporarily(function () - SILE.call("font", { weight = 800, size = "22pt" }, content) - end) + SILE.call("font", { weight = 800, size = "22pt" }, content) end) + self:registerCommand("book:sectionfont", function (_, content) - SILE.settings:temporarily(function () - SILE.call("font", { weight = 800, size = "15pt" }, content) - end) + SILE.call("font", { weight = 800, size = "15pt" }, content) end) self:registerCommand("book:subsectionfont", function (_, content) - SILE.settings:temporarily(function () - SILE.call("font", { weight = 800, size = "12pt" }, content) - end) + SILE.call("font", { weight = 800, size = "12pt" }, content) end) end diff --git a/configure.ac b/configure.ac index 917c0361f..098f34d58 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,11 @@ AC_PROG_GREP AC_PROG_OBJC AC_PROG_SED QUE_PROGVAR([cmp]) +QUE_PROGVAR([diff]) QUE_PROGVAR([find]) +QUE_PROGVAR([head]) QUE_PROGVAR([jq]) +QUE_PROGVAR([luarocks]) QUE_PROGVAR([pdfinfo]) QUE_PROGVAR([sort]) QUE_PROGVAR([xargs]) @@ -177,18 +180,21 @@ AM_COND_IF([FONT_DOWNLOAD_TOOLS], [ ]) AM_COND_IF([DEVELOPER_MODE], [ + AX_WITH_PROG([DELTA], [delta], [cat]) + AX_WITH_PROG([PERL], [perl]) +]) + +AM_COND_IF([DEVELOPER_TOOLS], [ QUE_PROGVAR([busted]) + QUE_PROGVAR([cargosetversion], [cargo-set-version]) QUE_PROGVAR([curl]) - QUE_PROGVAR([delta]) - QUE_PROGVAR([diff]) - QUE_PROGVAR([head]) QUE_PROGVAR([ldoc]) QUE_PROGVAR([luacheck]) - QUE_PROGVAR([luarocks]) QUE_PROGVAR([nix]) QUE_PROGVAR([npm]) QUE_PROGVAR([perl]) QUE_PROGVAR([stylua]) + QUE_PROGVAR([taplo]) QUE_PROGVAR([tr]) QUE_PROGVAR([typos]) QUE_PROGVAR([xsltproc]) @@ -200,38 +206,33 @@ AX_LUA_LIBS AM_COND_IF([SYSTEM_LUAROCKS], [ AS_IF([test "$LUA_SHORT_VERSION" -lt 52], [ - AM_COND_IF([LUAJIT], [], [ - AX_LUA_MODULE([bit32], [bit32]) - ]) + AM_COND_IF([LUAJIT], [], [AX_LUA_MODULE(bit32)]) ]) - AX_LUA_MODULE([cassowary], [cassowary]) - AS_IF([test "$LUA_SHORT_VERSION" -lt 53], [ - AX_LUA_MODULE([compat53], [compat53]) - ]) - AX_LUA_MODULE([cldr], [cldr]) - AX_LUA_MODULE([fluent], [fluent]) - AX_LUA_MODULE([linenoise], [linenoise]) - AX_LUA_MODULE([loadkit], [loadkit]) - AX_LUA_MODULE([lpeg], [lpeg]) - AX_LUA_MODULE([zlib], [lua-zlib]) - AX_LUA_MODULE([cliargs], [lua_cliargs]) - AX_LUA_MODULE([epnf], [luaepnf]) - AX_LUA_MODULE([lxp], [luaexpat]) - AX_LUA_MODULE([lfs], [luafilesystem]) - AX_LUA_MODULE([repl], [luarepl]) - AX_LUA_MODULE([ssl], [luasec]) - AX_LUA_MODULE([socket], [luasocket]) - AX_LUA_MODULE([lua-utf8], [luautf8]) - AX_LUA_MODULE([pl], [penlight]) - AX_LUA_MODULE([vstruct], [vstruct]) + AX_LUA_MODULE(cassowary) + AS_IF([test "$LUA_SHORT_VERSION" -lt 53], [AX_LUA_MODULE(compat53)]) + AX_LUA_MODULE(cldr) + AX_LUA_MODULE(fluent) + AX_LUA_MODULE(linenoise) + AX_LUA_MODULE(loadkit) + AX_LUA_MODULE(lpeg) + AX_LUA_MODULE(lua-zlib, zlib) + AX_LUA_MODULE(lua_cliargs, cliargs) + AX_LUA_MODULE(luaepnf, epnf) + AX_LUA_MODULE(luaexpat, lxp) + AX_LUA_MODULE(luafilesystem, lfs) + AX_LUA_MODULE(luafilesystem) + AX_LUA_MODULE(luarepl, repl) + AX_LUA_MODULE(luasec, ssl) + AX_LUA_MODULE(luasocket, socket) + AX_LUA_MODULE(luautf8, lua-utf8) + AX_LUA_MODULE(penlight, pl) + AX_LUA_MODULE(vstruct) ], [ - QUE_PROGVAR([luarocks]) QUE_PROGVAR([git]) # required for luarocks to install zlib rock ]) QUE_FONT(Gentium Plus) - AC_SUBST([APPKIT_TRUE]) AC_SUBST([FONTCONFIG_TRUE]) AC_SUBST([FONT_VARIATIONS_TRUE]) diff --git a/flake.nix b/flake.nix index 0a9c4ee36..4a2814a36 100644 --- a/flake.nix +++ b/flake.nix @@ -87,7 +87,6 @@ "--with-manual" ]; nativeBuildInputs = sile.nativeBuildInputs ++ [ - pkgs.luarocks # For regression test diff highlighting pkgs.delta # For commitlint git hook diff --git a/package.json b/package.json index 2a0e1aa6b..c5c06ce75 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ } ], "scripts": { - "postbump": "cargo generate-lockfile --offline", + "postbump": "taplo format Cargo.toml && cargo generate-lockfile --offline", "postcommit": "git add -u Cargo.lock && git commit --amend --no-edit" }, "infile": "CHANGELOG.md", diff --git a/packages/autodoc/init.lua b/packages/autodoc/init.lua index a48c38af7..5b279075d 100644 --- a/packages/autodoc/init.lua +++ b/packages/autodoc/init.lua @@ -389,7 +389,7 @@ function package:registerCommands () SILE.call("novbreak") SILE.call("fullrule", { thickness = "0.5pt" }) SILE.call("novbreak") - SILE.typesetter:pushVglue(-bs-ex) + SILE.typesetter:pushVglue(-bs - ex) SILE.call("novbreak") end) end diff --git a/packages/math/base-elements.lua b/packages/math/base-elements.lua index faea4b98e..b1a1baf5a 100644 --- a/packages/math/base-elements.lua +++ b/packages/math/base-elements.lua @@ -1028,6 +1028,17 @@ end function elements.text:shape () self.font.size = self.font.size * self:getScaleDown() + if isScriptMode(self.mode) then + local scriptFeature = SILE.settings:get("math.font.script.feature") + if scriptFeature then + self.font.features = ("+%s=1"):format(scriptFeature) + end + elseif isScriptScriptMode(self.mode) then + local scriptFeature = SILE.settings:get("math.font.script.feature") + if scriptFeature then + self.font.features = ("+%s=2"):format(scriptFeature) + end + end local face = SILE.font.cache(self.font, SILE.shaper.getFace) local mathMetrics = self:getMathMetrics() local glyphs = SILE.shaper:shapeToken(self.text, self.font) diff --git a/packages/math/init.lua b/packages/math/init.lua index c56a316bd..e4cbb0249 100644 --- a/packages/math/init.lua +++ b/packages/math/init.lua @@ -35,6 +35,12 @@ function package.declareSettings (_) type = "integer", default = 400, }) + SILE.settings:declare({ + parameter = "math.font.script.feature", + type = "string or nil", + default = "ssty", + help = "OpenType feature for the math script-style alternates (esp. primes), theoretically ssty", + }) SILE.settings:declare({ parameter = "math.font.filename", type = "string", @@ -137,6 +143,10 @@ By default, this package uses Libertinus Math, so it will fail if Libertinus Mat Another font may be specified via the setting \autodoc:setting{math.font.family}. If required, you can set the font style and weight via \autodoc:setting{math.font.style} and \autodoc:setting{math.font.weight}. The font size can be set via \autodoc:setting{math.font.size}. +The \autodoc:setting{math.font.script.feature} setting can be used to specify OpenType features for the math font, which are applied to the smaller script styles. +It defaults to \code{ssty} (script style alternates), notably to ensure that some symbols such as the prime, double prime, etc. are displayed correctly. +The default setting applies to Libertinus Math and well-designed math fonts, but some fonts may require different features. +(The STIX Two Math font has a stylitic set \code{ss04} from primes only, but also supports, according to its documentation, \code{ssty}, which provides other optical adjustments.) \paragraph{MathML} The first way to typeset math formulas is to enter them in the MathML format. diff --git a/packages/math/texlike.lua b/packages/math/texlike.lua index dcd6efdba..f5eef5f5e 100644 --- a/packages/math/texlike.lua +++ b/packages/math/texlike.lua @@ -119,16 +119,49 @@ local mathGrammar = function (_ENV) return pl.utils.unpack(t) end + -- TeX uses the regular asterisk (* = U+002A) in superscripts or subscript: + -- The TeXbook exercice 18.32 (p. 179, 330) for instance. + -- Fonts usually have the asterisk raised too high, so using the Unicode + -- asterisk operator U+2217 looks better (= \ast in TeX). + local astop = P"*" / luautf8.char(0x2217) + -- TeX interprets apostrophes as primes in math mode: + -- The TeXbook p. 130 expands ' to ^\prime commands and repeats the \prime + -- for multiple apostrophes. + -- The TeXbook p. 134: "Then there is the character ', which we know is used + -- as an abbreviation for \prime superscripts." + -- (So we are really sure superscript primes are really the intended meaning.) + -- Here we use the Unicode characters for primes, but the intent is the same. + local primes = ( + P"''''" / luautf8.char(0x2057) + -- quadruple prime + P"'''" / luautf8.char(0x2034) + -- triple prime + P"''" / luautf8.char(0x2033) + -- double prime + P"'" / luautf8.char(0x2032) -- prime + ) / function (s) + return { id="atom", s } + end + local primes_sup = ( + primes * _ * P"^" * _ * element_no_infix / function (p, e) + -- Combine the prime with the superscript in the same mathlist + if e.id == "mathlist" then + table.insert(e, 1, p) + return e + end + return { id="mathlist", p, e } + end + + primes -- or standalone primes + ) + START "math" math = V"mathlist" * EOF"Unexpected character at end of math code" mathlist = (comment + (WS * _) + element)^0 - supsub = element_no_infix * _ * P"^" * _ * element_no_infix * _ * - P"_" * _ * element_no_infix - subsup = element_no_infix * _ * P"_" * _ * element_no_infix * _ * - P"^" * _ * element_no_infix - sup = element_no_infix * _ * P"^" * _ * element_no_infix + supsub = element_no_infix * _ * primes_sup * _ * P"_" * _ * element_no_infix + + element_no_infix * _ * P"^" * _ * element_no_infix * _ * P"_" * _ * element_no_infix + subsup = element_no_infix * _ * P"_" * _ * element_no_infix * primes_sup + + element_no_infix * _ * P"_" * _ * element_no_infix * _ * P"^" * _ * element_no_infix + sup = element_no_infix * _ * primes_sup + + element_no_infix * _ * P"^" * _ * element_no_infix sub = element_no_infix * _ * P"_" * _ * element_no_infix - atom = natural + C(utf8code - S"\\{}%^_&") + + atom = natural + astop + C(utf8code - S"\\{}%^_&'") + (P"\\{" + P"\\}") / function (s) return string.sub(s, -1) end text = ( P"\\text" * diff --git a/packages/pandoc/init.lua b/packages/pandoc/init.lua index ac3058a18..c8a5a4668 100644 --- a/packages/pandoc/init.lua +++ b/packages/pandoc/init.lua @@ -56,6 +56,12 @@ function package:_init () self:loadPackage("rules") self:loadPackage("url") self:loadPackage("verbatim") + self.class:registerPostinit(function () + -- Override the url package which styles URLs as code, something Pandoc content tends to double up on + self:registerCommand("urlstyle", function (_, content) + SILE.process(content) + end) + end) end function package:registerCommands () @@ -280,7 +286,7 @@ function package:registerCommands () self:registerCommand("ListItemTerm", function (_, content) SILE.call("smallskip") - SILE.call("strong", content) + SILE.call("strong", {}, content) SILE.typesetter:typeset(" : ") end) diff --git a/rusile/Cargo.toml b/rusile/Cargo.toml index 8606b30ee..dbe411618 100644 --- a/rusile/Cargo.toml +++ b/rusile/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rusile" description = "Rusty components for the SILE typesetter" -readme = "README.md" +readme = "../README.md" version.workspace = true edition.workspace = true rust-version.workspace = true @@ -13,18 +13,18 @@ license.workspace = true [lib] crate-type = ["rlib", "cdylib", "staticlib"] -[dependencies.sile] -path = ".." - [features] default = [] -lua54 = [ "mlua/lua54" ] -lua53 = [ "mlua/lua53" ] -lua52 = [ "mlua/lua52" ] -lua51 = [ "mlua/lua51" ] -luajit = [ "mlua/luajit" ] -vendored = [ "mlua/vendored" ] +lua54 = ["mlua/lua54"] +lua53 = ["mlua/lua53"] +lua52 = ["mlua/lua52"] +lua51 = ["mlua/lua51"] +luajit = ["mlua/luajit"] +vendored = ["mlua/vendored"] + +[dependencies.sile] +workspace = true [dependencies.mlua] workspace = true -features = [ "macros", "module" ] +features = ["macros", "module"] diff --git a/spec/languages_spec.lua b/spec/languages_spec.lua index 3d5b422f4..83a87de06 100644 --- a/spec/languages_spec.lua +++ b/spec/languages_spec.lua @@ -1,7 +1,6 @@ SILE = require("core.sile") describe("Language module", function () - it("should set env locale", function () SILE.call("language", { main = "tr" }) local syslang = os.getenv("LANG") diff --git a/tests/bug-1495-inline-math-layout.expected b/tests/bug-1495-inline-math-layout.expected index b4c8ae2bd..fd480cc28 100644 --- a/tests/bug-1495-inline-math-layout.expected +++ b/tests/bug-1495-inline-math-layout.expected @@ -54,7 +54,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 196.6642 My 37.4447 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 198.4962 T 3421 w=4.5776 (nil) @@ -101,7 +101,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 199.7501 My 49.5701 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 201.5821 T 3413 w=3.5152 (nil) diff --git a/tests/feat-math-display-numbered.expected b/tests/feat-math-display-numbered.expected index 265f6825e..5fe667914 100644 --- a/tests/feat-math-display-numbered.expected +++ b/tests/feat-math-display-numbered.expected @@ -12,7 +12,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 129.6547 My 48.7418 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 131.4867 T 3421 w=4.5776 (nil) @@ -49,7 +49,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 129.6547 My 108.3223 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 131.4867 T 3421 w=4.5776 (nil) @@ -88,7 +88,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 129.6547 My 167.9027 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 131.4867 T 3421 w=4.5776 (nil) @@ -133,7 +133,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 129.6547 My 227.4832 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 131.4867 T 3421 w=4.5776 (nil) @@ -176,7 +176,7 @@ My 285.3548 T 2765 w=4.9200 (nil) Mx 104.6983 My 287.4548 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 114.8483 My 285.3548 @@ -189,7 +189,7 @@ My 300.1048 T 2765 w=4.9200 (nil) Mx 104.6855 My 302.2048 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 114.8483 My 300.1048 @@ -203,7 +203,7 @@ Mx 140.6728 T 2765 w=4.9200 (nil) Mx 145.2328 My 302.2048 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 148.9656 T 2088 w=5.1840 (nil) @@ -246,7 +246,7 @@ Mx 146.0615 T 2750 w=3.8100 (nil) Mx 149.8715 My 341.0405 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 151.7035 T 3421 w=4.5776 (nil) diff --git a/tests/feat-math-display-unnumbered.expected b/tests/feat-math-display-unnumbered.expected index 590b7a455..23a182dd7 100644 --- a/tests/feat-math-display-unnumbered.expected +++ b/tests/feat-math-display-unnumbered.expected @@ -12,7 +12,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 135.7213 My 47.6655 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 137.5533 T 3421 w=4.5776 (nil) @@ -43,7 +43,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 135.7213 My 105.2660 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 137.5533 T 3421 w=4.5776 (nil) @@ -76,7 +76,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 135.7213 My 162.8665 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 137.5533 T 3421 w=4.5776 (nil) @@ -115,7 +115,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2750 w=3.8100 (nil) Mx 135.7213 My 220.4670 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 137.5533 T 3421 w=4.5776 (nil) diff --git a/tests/math-bigops.expected b/tests/math-bigops.expected index 56b4890e1..de7dfa5d2 100644 --- a/tests/math-bigops.expected +++ b/tests/math-bigops.expected @@ -18,7 +18,7 @@ Mx 166.2055 T 29 w=2.2900 (:) Mx 179.4186 My 47.7505 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2100 w=6.2800 (nil) Mx 171.1686 My 52.8405 @@ -26,7 +26,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2250 w=8.2500 (nil) Mx 179.4186 My 55.6505 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2754 w=2.5392 (nil) Mx 181.9578 T 30 w=5.1840 (nil) @@ -41,7 +41,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2085 w=10.0200 (nil) Mx 202.9784 My 55.6505 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 206.7112 T 30 w=5.1840 (nil) @@ -56,7 +56,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2087 w=8.4700 (nil) Mx 226.1819 My 55.6205 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2757 w=5.6752 (nil) Mx 231.8571 T 30 w=5.1840 (nil) @@ -68,15 +68,15 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 70 w=4.4700 (nil) Mx 254.1038 My 44.7465 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 78 w=4.7400 (nil) Mx 247.3278 My 48.7785 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2087 w=6.7760 (nil) Mx 254.1038 My 51.0025 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 255.4778 T 30 w=3.8880 (nil) @@ -84,11 +84,11 @@ Mx 259.3658 T 17 w=2.7900 (nil) Mx 264.1664 My 48.7785 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 3409 w=3.7408 (nil) Mx 267.3504 My 50.4585 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 268.7244 T 13 w=1.3200 (nil) @@ -126,7 +126,7 @@ Mx 215.6651 T 29 w=2.2900 (:) Mx 238.1188 My 68.4073 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2100 w=11.3040 (nil) Mx 223.2688 My 77.5693 @@ -134,7 +134,7 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 2250 w=14.8500 (nil) Mx 238.1188 My 82.6273 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2754 w=4.5706 (nil) Mx 242.6894 T 30 w=9.3312 (nil) @@ -149,7 +149,7 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 2085 w=18.0360 (nil) Mx 280.5266 My 82.6273 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2758 w=6.7190 (nil) Mx 287.2456 T 30 w=9.3312 (nil) @@ -164,7 +164,7 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 2087 w=15.2460 (nil) Mx 322.2928 My 82.5733 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2757 w=10.2154 (nil) Mx 332.5082 T 30 w=9.3312 (nil) @@ -176,15 +176,15 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 70 w=8.0460 (nil) Mx 372.5522 My 63.0001 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 78 w=8.5320 (nil) Mx 360.3554 My 70.2577 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2087 w=12.1968 (nil) Mx 372.5522 My 74.2609 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 2753 w=2.4732 (nil) Mx 375.0254 T 30 w=6.9984 (nil) @@ -192,11 +192,11 @@ Mx 382.0238 T 17 w=5.0220 (nil) Mx 390.6650 My 70.2577 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 3409 w=6.7334 (nil) Mx 396.3962 My 73.2817 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 2753 w=2.4732 (nil) Mx 398.8694 T 13 w=2.3760 (nil) @@ -226,7 +226,7 @@ Mx 179.0098 T 29 w=2.2900 (:) Mx 254.3807 My 110.1369 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2100 w=6.2800 (nil) Mx 251.8307 My 122.0169 @@ -235,7 +235,7 @@ Mx 10.3800 T 4096 a=11.3800 (nil) Mx 251.7991 My 132.8409 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2754 w=2.5392 (nil) Mx 254.3383 T 30 w=5.1840 (nil) @@ -251,7 +251,7 @@ Mx 13.1800 T 3986 a=14.1800 (nil) Mx 265.6806 My 132.8219 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 269.4134 T 30 w=5.1840 (nil) @@ -267,7 +267,7 @@ Mx 10.6300 T 3985 a=12.4300 (nil) Mx 280.7556 My 132.6619 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2757 w=5.6752 (nil) Mx 286.4308 T 30 w=5.1840 (nil) @@ -279,15 +279,15 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 70 w=4.4700 (nil) Mx 308.2475 My 114.0229 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 78 w=4.7400 (nil) Mx 301.4715 My 118.0549 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2087 w=6.7760 (nil) Mx 308.2475 My 120.2789 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 309.6215 T 30 w=3.8880 (nil) @@ -295,11 +295,11 @@ Mx 313.5095 T 17 w=2.7900 (nil) Mx 318.3102 My 118.0549 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 3409 w=3.7408 (nil) Mx 321.4942 My 119.7349 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 322.8682 T 13 w=1.3200 (nil) @@ -337,7 +337,7 @@ Mx 228.5467 T 29 w=2.2900 (:) Mx 219.7750 My 171.2807 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2100 w=11.3040 (nil) Mx 215.1850 My 192.6647 @@ -346,7 +346,7 @@ Mx 18.6840 T 4096 a=20.4840 (nil) Mx 215.1281 My 212.1479 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2754 w=4.5706 (nil) Mx 219.6987 T 30 w=9.3312 (nil) @@ -362,7 +362,7 @@ Mx 23.7240 T 3986 a=25.5240 (nil) Mx 240.1148 My 212.1137 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2758 w=6.7190 (nil) Mx 246.8338 T 30 w=9.3312 (nil) @@ -378,7 +378,7 @@ Mx 19.1340 T 3985 a=22.3740 (nil) Mx 267.2499 My 211.8257 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2757 w=10.2154 (nil) Mx 277.4652 T 30 w=9.3312 (nil) @@ -390,15 +390,15 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 70 w=8.0460 (nil) Mx 316.7352 My 178.2755 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 78 w=8.5320 (nil) Mx 304.5384 My 185.5331 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2087 w=12.1968 (nil) Mx 316.7352 My 189.5363 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 2753 w=2.4732 (nil) Mx 319.2084 T 30 w=6.9984 (nil) @@ -406,11 +406,11 @@ Mx 326.2068 T 17 w=5.0220 (nil) Mx 334.8480 My 185.5331 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 3409 w=6.7334 (nil) Mx 340.5792 My 188.5571 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 2753 w=2.4732 (nil) Mx 343.0524 T 13 w=2.3760 (nil) @@ -440,7 +440,7 @@ Mx 148.0572 T 29 w=2.2900 (:) Mx 161.2722 My 230.7047 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2100 w=6.2800 (nil) Mx 153.0222 My 235.7947 @@ -448,7 +448,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2250 w=8.2500 (nil) Mx 161.2722 My 238.6047 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2754 w=2.5392 (nil) Mx 163.8114 T 30 w=5.1840 (nil) @@ -463,7 +463,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2085 w=10.0200 (nil) Mx 184.8321 My 238.6047 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 188.5649 T 30 w=5.1840 (nil) @@ -478,7 +478,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2087 w=8.4700 (nil) Mx 208.0356 My 238.5747 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2757 w=5.6752 (nil) Mx 213.7108 T 30 w=5.1840 (nil) @@ -490,15 +490,15 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 70 w=4.4700 (nil) Mx 235.9574 My 227.7007 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2757 w=4.2288 (nil) Mx 229.1814 My 231.7327 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2087 w=6.7760 (nil) Mx 235.9574 My 233.9567 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 237.3314 T 30 w=3.8880 (nil) @@ -506,11 +506,11 @@ Mx 241.2194 T 17 w=2.7900 (nil) Mx 246.0201 My 231.7327 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 3409 w=3.7408 (nil) Mx 249.2041 My 233.4127 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 250.5781 T 13 w=1.3200 (nil) @@ -540,7 +540,7 @@ Mx 160.8615 T 29 w=2.2900 (:) Mx 254.3807 My 264.8535 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2100 w=6.2800 (nil) Mx 251.8307 My 276.7335 @@ -549,7 +549,7 @@ Mx 10.3800 T 4096 a=11.3800 (nil) Mx 251.7991 My 287.5575 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2754 w=2.5392 (nil) Mx 254.3383 T 30 w=5.1840 (nil) @@ -565,7 +565,7 @@ Mx 13.1800 T 3986 a=14.1800 (nil) Mx 265.6806 My 287.5385 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 269.4134 T 30 w=5.1840 (nil) @@ -581,7 +581,7 @@ Mx 10.6300 T 3985 a=12.4300 (nil) Mx 280.7556 My 287.3785 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2757 w=5.6752 (nil) Mx 286.4308 T 30 w=5.1840 (nil) @@ -593,15 +593,15 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 70 w=4.4700 (nil) Mx 308.2475 My 268.7395 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2757 w=4.2288 (nil) Mx 301.4715 My 272.7715 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2087 w=6.7760 (nil) Mx 308.2475 My 274.9955 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 309.6215 T 30 w=3.8880 (nil) @@ -609,11 +609,11 @@ Mx 313.5095 T 17 w=2.7900 (nil) Mx 318.3102 My 272.7715 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 3409 w=3.7408 (nil) Mx 321.4942 My 274.4515 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 2753 w=1.3740 (nil) Mx 322.8682 T 13 w=1.3200 (nil) @@ -644,7 +644,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2117 w=7.4000 (nil) Mx 159.5797 My 312.2195 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2738 w=3.7616 (nil) Mx 163.7713 My 308.8795 @@ -659,14 +659,14 @@ T 30 w=6.4800 (nil) Draw line 198.9417 305.9545 5.7340 0.6500 Mx 199.9487 My 304.0795 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 198.9417 My 313.6795 T 3410 w=3.0096 (nil) Mx 201.5417 My 315.3595 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 17 w=2.7900 (nil) Mx 205.4257 My 308.8795 @@ -674,7 +674,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2115 w=11.2500 (nil) Mx 213.6757 My 312.2195 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2741 w=5.0112 (nil) Mx 219.1169 My 308.8795 @@ -688,7 +688,7 @@ Mx 248.3500 T 2113 w=6.4500 (nil) Mx 251.8000 My 312.2195 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 253.3000 My 303.0795 @@ -736,7 +736,7 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 2117 w=13.3200 (nil) Mx 217.6133 My 339.8267 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2738 w=6.7709 (nil) Mx 225.1582 My 333.8147 @@ -751,14 +751,14 @@ T 30 w=11.6640 (nil) Draw line 287.6488 328.5497 10.3212 1.1700 Mx 289.4614 My 325.1747 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 18 w=6.6960 (nil) Mx 287.6488 My 342.4547 T 3410 w=5.4173 (nil) Mx 292.3288 My 345.4787 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 17 w=5.0220 (nil) Mx 298.7200 My 333.8147 @@ -766,7 +766,7 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 2115 w=20.2500 (nil) Mx 313.5700 My 339.8267 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2741 w=9.0202 (nil) Mx 323.3642 My 333.8147 @@ -780,7 +780,7 @@ Mx 375.8292 T 2113 w=11.6100 (nil) Mx 382.0392 My 339.8267 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 17 w=6.6960 (nil) Mx 384.7392 My 323.3747 @@ -822,7 +822,7 @@ Mx 9.7200 T 4231 a=10.7600 (nil) Mx 237.3944 My 390.1805 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2738 w=3.7616 (nil) Mx 241.5860 My 381.4105 @@ -843,7 +843,7 @@ My 388.4105 T 3410 w=3.8900 (nil) Mx 279.7860 My 390.5105 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 284.6860 My 384.4305 @@ -852,7 +852,7 @@ Mx 12.1800 T 3983 a=13.7400 (nil) Mx 295.9260 My 390.1805 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2741 w=5.0112 (nil) Mx 301.3672 My 381.4105 @@ -868,7 +868,7 @@ Mx 5.3800 T 3981 a=6.9400 (nil) Mx 334.8828 My 390.1805 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 337.3828 My 370.1905 @@ -918,7 +918,7 @@ Mx 17.4960 T 4231 a=19.3680 (nil) Mx 189.7997 My 463.3121 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2738 w=6.7709 (nil) Mx 197.3446 My 447.5261 @@ -939,7 +939,7 @@ My 460.1261 T 3410 w=7.0020 (nil) Mx 265.5046 My 463.9061 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 17 w=6.6960 (nil) Mx 273.7246 My 452.9621 @@ -948,7 +948,7 @@ Mx 21.9240 T 3983 a=24.7320 (nil) Mx 293.9566 My 463.3121 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2741 w=9.0202 (nil) Mx 303.7508 My 447.5261 @@ -964,7 +964,7 @@ Mx 9.6840 T 3981 a=12.4920 (nil) Mx 364.0788 My 463.3121 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 17 w=6.6960 (nil) Mx 368.5788 My 427.3301 @@ -1004,7 +1004,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2117 w=7.4000 (nil) Mx 141.4314 My 487.1361 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2738 w=3.7616 (nil) Mx 145.6230 My 483.7961 @@ -1019,14 +1019,14 @@ T 30 w=6.4800 (nil) Draw line 180.8075 480.8711 5.7340 0.6500 Mx 181.8145 My 478.9961 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 180.8075 My 488.5961 T 3410 w=3.0096 (nil) Mx 183.4075 My 490.2761 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 17 w=2.7900 (nil) Mx 187.2915 My 483.7961 @@ -1034,7 +1034,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2115 w=11.2500 (nil) Mx 195.5415 My 487.1361 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2741 w=5.0112 (nil) Mx 200.9827 My 483.7961 @@ -1048,7 +1048,7 @@ Mx 230.2258 T 2113 w=6.4500 (nil) Mx 233.6758 My 487.1361 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 235.1758 My 477.9961 @@ -1088,7 +1088,7 @@ Mx 9.7200 T 4231 a=10.7600 (nil) Mx 237.3944 My 534.9299 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2738 w=3.7616 (nil) Mx 241.5860 My 526.1599 @@ -1109,7 +1109,7 @@ My 533.1599 T 3410 w=3.8900 (nil) Mx 279.7860 My 535.2599 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 284.6860 My 529.1799 @@ -1118,7 +1118,7 @@ Mx 12.1800 T 3983 a=13.7400 (nil) Mx 295.9260 My 534.9299 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2741 w=5.0112 (nil) Mx 301.3672 My 526.1599 @@ -1134,7 +1134,7 @@ Mx 5.3800 T 3981 a=6.9400 (nil) Mx 334.8828 My 534.9299 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 337.3828 My 514.9399 diff --git a/tests/math-fractions.expected b/tests/math-fractions.expected index acc9bf02a..3e6267ca1 100644 --- a/tests/math-fractions.expected +++ b/tests/math-fractions.expected @@ -17,7 +17,7 @@ T 29 w=2.2900 (:) Draw line 154.6577 48.8335 37.9800 0.6500 Mx 171.7877 My 46.9585 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 154.6577 My 57.6215 @@ -27,7 +27,7 @@ T 12 w=5.1840 (nil) Draw line 164.3117 55.2815 27.5760 0.5200 Mx 176.7047 My 53.7815 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 18 w=2.7900 (nil) Mx 164.3117 My 62.8495 @@ -61,7 +61,7 @@ T 12 w=6.4800 (nil) Draw line 205.1412 48.8335 3.7200 0.6500 Mx 205.1412 My 46.9585 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) My 56.5585 T 19 w=3.7200 (nil) @@ -92,7 +92,7 @@ T 12 w=6.4800 (nil) Draw line 281.9868 110.8003 29.8020 0.6500 Mx 295.0278 My 108.9253 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 281.9868 My 119.5883 @@ -102,7 +102,7 @@ T 12 w=5.1840 (nil) Draw line 291.6408 117.2483 19.3980 0.5200 Mx 299.9448 My 115.7483 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 18 w=2.7900 (nil) Mx 291.6408 My 124.8163 @@ -147,7 +147,7 @@ T 29 w=2.2900 (:) Draw line 136.5094 144.6193 37.9800 0.6500 Mx 153.6394 My 142.7443 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 136.5094 My 153.4073 @@ -157,7 +157,7 @@ T 12 w=5.1840 (nil) Draw line 146.1634 151.0673 27.5760 0.5200 Mx 158.5564 My 149.5673 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 18 w=2.7900 (nil) Mx 146.1634 My 158.6353 @@ -191,7 +191,7 @@ T 12 w=6.4800 (nil) Draw line 186.9970 144.6193 3.7200 0.6500 Mx 186.9970 My 142.7443 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) My 152.3443 T 19 w=3.7200 (nil) @@ -222,7 +222,7 @@ T 12 w=6.4800 (nil) Draw line 281.9868 206.5861 29.8020 0.6500 Mx 295.0278 My 204.7111 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 281.9868 My 215.3741 @@ -232,7 +232,7 @@ T 12 w=5.1840 (nil) Draw line 291.6408 213.0341 19.3980 0.5200 Mx 299.9448 My 211.5341 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 18 w=2.7900 (nil) Mx 291.6408 My 220.6021 @@ -263,7 +263,7 @@ T 19 w=4.6500 (nil) Draw line 50.5138 240.4851 10.7360 0.6500 Mx 50.5138 My 238.6101 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 52.3458 T 12 w=5.1840 (nil) diff --git a/tests/math-macros.expected b/tests/math-macros.expected index 857e88b8d..5f8bc25cd 100644 --- a/tests/math-macros.expected +++ b/tests/math-macros.expected @@ -6,7 +6,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 84 74 79 w=12.0300 (nil) Mx 255.0472 My 47.9345 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 9 w=2.8480 (nil) Mx 257.8952 T 19 w=3.7200 (nil) @@ -36,7 +36,7 @@ Mx 316.7856 T 10 w=3.5600 (nil) Mx 320.3456 My 47.1045 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 326.5084 My 52.1045 @@ -68,7 +68,7 @@ Mx 10.6300 T 3985 a=12.4300 (nil) Mx 304.7752 My 97.9626 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 313.5729 My 87.3536 @@ -76,7 +76,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2776 w=6.0300 (nil) Mx 318.4629 My 89.4536 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2753 w=1.8320 (nil) Mx 262.2436 My 124.5066 @@ -87,7 +87,7 @@ Mx 265.8036 T 3424 w=5.6700 (nil) Mx 270.4736 My 126.6066 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 274.6236 My 124.5066 @@ -97,7 +97,7 @@ Mx 278.4903 T 3424 w=5.6700 (nil) Mx 283.1603 My 126.6066 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 287.3103 My 124.5066 @@ -111,7 +111,7 @@ Mx 302.5336 T 3424 w=5.6700 (nil) Mx 307.2036 My 126.6066 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 311.3664 My 124.5066 diff --git a/tests/math-primes-asterisk.expected b/tests/math-primes-asterisk.expected new file mode 100644 index 000000000..cdc4bbdf0 --- /dev/null +++ b/tests/math-primes-asterisk.expected @@ -0,0 +1,440 @@ +Set paper size 419.5275636 595.275597 +Begin page +Mx 158.0943 +My 37.2338 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 164.8566 +T 2093 w=4.9500 (nil) +Mx 172.0288 +T 2747 w=4.3400 (nil) +Mx 186.3688 +T 2746 w=4.5400 (nil) +Mx 193.1310 +T 2093 w=4.9500 (nil) +Mx 200.3032 +T 2747 w=4.3400 (nil) +Mx 214.6432 +T 2746 w=4.5400 (nil) +Mx 219.1832 +My 33.4838 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 2093 w=3.9600 (nil) +Mx 233.5732 +My 37.2338 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 238.1132 +My 33.4838 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 2093 w=3.9600 (nil) +Mx 252.5032 +My 37.2338 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 256.7832 +My 39.3838 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 257.0432 +My 33.4838 +T 2093 w=3.9600 (nil) +Mx 153.7638 +My 67.3978 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 158.3038 +My 63.6478 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 171.7898 +My 67.3978 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 176.3298 +My 63.6478 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3792 w=5.2960 (nil) +Mx 192.0558 +My 67.3978 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 196.5958 +My 63.6478 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3793 w=7.5360 (nil) +Mx 214.5618 +My 67.3978 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 218.8418 +My 69.7718 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 219.1018 +My 63.6478 +T 3791 w=3.0560 (nil) +Mx 232.9918 +My 67.3978 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 237.2718 +My 69.7718 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 237.5318 +My 63.6478 +T 3792 w=5.2960 (nil) +Mx 253.2578 +My 67.3978 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 257.5378 +My 69.7718 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 257.7978 +My 63.6478 +T 3793 w=7.5360 (nil) +Mx 176.2698 +My 97.5619 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 180.8098 +My 93.8119 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 194.2958 +My 97.5619 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 198.8358 +My 93.8119 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3792 w=5.2960 (nil) +Mx 214.5618 +My 97.5619 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 218.8418 +My 99.9359 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 219.1018 +My 93.8119 +T 3791 w=3.0560 (nil) +Mx 232.9918 +My 97.5619 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2746 w=4.5400 (nil) +Mx 237.2718 +My 99.9359 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 237.5318 +My 93.8119 +T 3792 w=5.2960 (nil) +Mx 143.4058 +My 127.8760 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2747 w=4.3400 (nil) +Mx 147.7458 +My 124.1260 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 150.8018 +T 19 w=3.7200 (nil) +Mx 164.9518 +My 127.8760 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2747 w=4.3400 (nil) +Mx 169.2918 +My 124.1260 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3792 w=5.2960 (nil) +Mx 174.5878 +T 19 w=3.7200 (nil) +Mx 188.7378 +My 127.8760 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2747 w=4.3400 (nil) +Mx 193.0778 +My 124.1260 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3793 w=7.5360 (nil) +Mx 200.6138 +T 19 w=3.7200 (nil) +Mx 214.7638 +My 127.8760 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2747 w=4.3400 (nil) +Mx 218.7638 +My 130.4560 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 219.1038 +My 124.0600 +T 3791 w=3.0560 (nil) +Mx 222.1598 +T 19 w=3.7200 (nil) +Mx 236.3098 +My 127.8760 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2747 w=4.3400 (nil) +Mx 240.3098 +My 130.4560 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 240.6498 +My 124.0600 +T 3792 w=5.2960 (nil) +Mx 245.9458 +T 19 w=3.7200 (nil) +Mx 260.0958 +My 127.8760 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2747 w=4.3400 (nil) +Mx 264.0958 +My 130.4560 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 264.4358 +My 124.0600 +T 3793 w=7.5360 (nil) +Mx 271.9718 +T 19 w=3.7200 (nil) +Mx 117.4131 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2751 w=5.8900 (nil) +Mx 123.3031 +My 154.5800 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 126.7891 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +Mx 2.0900 +T 60 a=3.4700 (nil) +Mx 130.2591 +T 2752 w=5.4900 (nil) +Mx 135.7491 +T 9 w=3.5600 (nil) +Mx 139.3091 +T 2768 w=5.4100 (nil) +Mx 144.7191 +T 10 w=3.5600 (nil) +Mx 148.2791 +Mx 2.0900 +T 62 a=3.4700 (nil) +Mx 151.7491 +T 2752 w=5.4900 (nil) +Mx 157.2391 +My 154.5800 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 160.7251 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 9 w=3.5600 (nil) +Mx 164.2851 +T 2768 w=5.4100 (nil) +Mx 169.6951 +T 10 w=3.5600 (nil) +Mx 183.2551 +T 2769 w=5.4000 (nil) +Mx 187.6951 +My 160.6880 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 18 w=3.7200 (nil) +Mx 188.6551 +My 154.5800 +T 3791 w=3.0560 (nil) +Mx 194.3633 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 12 w=6.4800 (nil) +Mx 203.0656 +T 2769 w=5.4000 (nil) +Mx 207.5056 +My 160.7040 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 19 w=3.7200 (nil) +Mx 208.4656 +My 154.5800 +T 3792 w=5.2960 (nil) +Mx 224.1916 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2769 w=5.4000 (nil) +Mx 228.6316 +My 160.6880 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 18 w=3.7200 (nil) +Mx 229.5916 +My 154.5800 +T 3791 w=3.0560 (nil) +Mx 235.2998 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 12 w=6.4800 (nil) +Mx 244.0020 +T 2769 w=5.4000 (nil) +Mx 248.4420 +My 160.7040 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 19 w=3.7200 (nil) +Mx 249.4020 +My 154.5800 +T 3792 w=5.2960 (nil) +Mx 265.1280 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2769 w=5.4000 (nil) +Mx 269.5680 +My 160.7040 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 20 w=3.7200 (nil) +Mx 270.5280 +My 154.5800 +T 3793 w=7.5360 (nil) +Mx 280.7162 +My 158.3300 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 12 w=6.4800 (nil) +Mx 289.4184 +T 2752 w=5.4900 (nil) +Mx 294.9084 +My 154.5800 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 297.9644 +T 19 w=3.7200 (nil) +Mx 111.3119 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2768 w=5.4100 (nil) +Mx 116.7219 +My 184.8941 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 119.7779 +T 19 w=3.7200 (nil) +Mx 126.7056 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 30 w=6.4800 (nil) +Mx 135.9634 +T 2768 w=5.4100 (nil) +Mx 141.3734 +My 184.8941 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 144.4294 +T 19 w=3.7200 (nil) +Mx 158.5794 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2768 w=5.4100 (nil) +Mx 163.9894 +My 184.8941 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 167.0454 +T 2758 w=3.7328 (nil) +Mx 170.7782 +T 12 w=5.1840 (nil) +Mx 175.9622 +T 18 w=3.7200 (nil) +Mx 182.8900 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 30 w=6.4800 (nil) +Mx 192.1478 +T 2768 w=5.4100 (nil) +Mx 197.5578 +My 184.8941 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 200.6138 +T 2758 w=3.7328 (nil) +Mx 204.3466 +T 12 w=5.1840 (nil) +Mx 209.5306 +T 18 w=3.7200 (nil) +Mx 223.6806 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2768 w=5.4100 (nil) +Mx 228.2806 +My 191.2241 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 229.0906 +My 184.8281 +T 3791 w=3.0560 (nil) +Mx 232.1466 +T 19 w=3.7200 (nil) +Mx 239.0744 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 30 w=6.4800 (nil) +Mx 248.3321 +T 2768 w=5.4100 (nil) +Mx 252.9321 +My 191.2241 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 17 w=3.7200 (nil) +Mx 253.7421 +My 184.8281 +T 3791 w=3.0560 (nil) +Mx 256.7981 +T 19 w=3.7200 (nil) +Mx 270.9481 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2768 w=5.4100 (nil) +Mx 275.5481 +My 191.2081 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 18 w=3.7200 (nil) +Mx 276.3581 +My 184.8281 +T 3791 w=3.0560 (nil) +Mx 279.4141 +T 19 w=3.7200 (nil) +Mx 286.3419 +My 188.6441 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 30 w=6.4800 (nil) +Mx 295.5997 +T 2768 w=5.4100 (nil) +Mx 300.1997 +My 191.2081 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 18 w=3.7200 (nil) +Mx 301.0097 +My 184.8281 +T 3791 w=3.0560 (nil) +Mx 304.0657 +T 19 w=3.7200 (nil) +Mx 201.8378 +My 219.8162 +Set font Libertinus Math;10;400;Regular;normal;;;LTR +T 2768 w=5.4100 (nil) +Mx 207.2478 +My 216.0662 +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR +T 3791 w=3.0560 (nil) +Mx 210.3038 +T 2769 w=4.1664 (nil) +Mx 214.6238 +My 213.0662 +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR +T 3791 w=2.2920 (nil) +Mx 207.4176 +My 553.7327 +Set font Gentium Plus;10;400;;normal;;;LTR +T 20 w=4.6924 (1) +End page +Finish diff --git a/tests/math-primes-asterisk.sil b/tests/math-primes-asterisk.sil new file mode 100644 index 000000000..ff55b0350 --- /dev/null +++ b/tests/math-primes-asterisk.sil @@ -0,0 +1,30 @@ + +\begin[papersize=a5]{document} +\use[module=packages.math] + +% TeX * = \ast +\math[mode=display]{a * b \quad a \ast b \quad a^* \quad a^\ast \quad a^\ast_0} + +% TeX ' and '' and ''' expand to superscripted \prime +\math[mode=display]{a' \quad a'' \quad a''' \quad a'_0 \quad a''_0 \quad a'''_0} + +% TeX-like prime commands used in superscript lead to the same result +\math[mode=display]{a^\prime \quad a^\dprime \quad a^\prime_0 \quad a^\dprime_0} + +% TeX allows ' etc. with another superscript +\math[mode=display]{b'^2 \quad b''^2 \quad b'''^2 \quad b'^2_0 \quad b''^2_0 \quad b'''^2_0} +% The TeXbook p. 130 exercise 16.4 moreover combines ' with superscript and subscript +% The rule is not detailed, but Knuth's example speaks for itself: +\math[mode=display]{f'[g(x)]g'(x) \quad y_1'+y_2'' \quad y'_1+y''_2 \quad y'''_3+g'^2} +% Knuth's last example implies the following: +\math[mode=display]{ + x'^2 = x^{\prime2} % sup (atoms) + \quad x'^{n+1} = x^{\prime n+1} % sup (expression) + \quad x_0'^2 = x_0^{\prime2} % subsup + \quad x'^2_1 = x^{\prime2}_1 % supsub +} + +% Check one level up +\math[mode=display]{x'^{y'}} + +\end{document} diff --git a/tests/math-spaces.expected b/tests/math-spaces.expected index a7fe5faa6..5e26a8a20 100644 --- a/tests/math-spaces.expected +++ b/tests/math-spaces.expected @@ -78,7 +78,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2768 w=5.4100 (nil) Mx 54.3638 My 123.7628 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 85 73 74 79 w=13.3360 (nil) Mx 69.0331 Mx 6.3200 @@ -97,7 +97,7 @@ Mx 175.4714 T 70 79 69 w=11.9600 (nil) Mx 187.4314 My 125.4428 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 85 73 74 79 w=10.0020 (nil) Mx 198.4334 Mx 4.7400 @@ -178,7 +178,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2768 w=5.4100 (nil) Mx 54.3638 My 215.5152 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 79 85 73 74 79 w=17.6720 (nil) Mx 70.7024 Mx 4.3360 @@ -192,7 +192,7 @@ Mx 105.8384 T 70 79 69 w=11.9600 (nil) Mx 117.7984 My 217.1952 -Set font Libertinus Math;6;400;Regular;normal;;;LTR +Set font Libertinus Math;6;400;Regular;normal;+ssty=2;;LTR T 79 85 73 74 79 w=13.2540 (nil) Mx 130.0524 Mx 3.2520 @@ -220,7 +220,7 @@ Set font Libertinus Math;6;400;Regular;normal;;;LTR T 2768 w=3.2460 (nil) Mx 52.5238 My 245.1016 -Set font Libertinus Math;4.8;400;Regular;normal;;;LTR +Set font Libertinus Math;4.8;400;Regular;normal;+ssty=1;;LTR T 85 73 74 79 w=8.0016 (nil) Mx 61.3254 Mx 3.7920 @@ -239,7 +239,7 @@ Mx 136.4025 T 70 79 69 w=7.1760 (nil) Mx 143.5785 My 246.1096 -Set font Libertinus Math;3.6;400;Regular;normal;;;LTR +Set font Libertinus Math;3.6;400;Regular;normal;+ssty=2;;LTR T 85 73 74 79 w=6.0012 (nil) Mx 150.1797 Mx 2.8440 @@ -262,7 +262,7 @@ Set font Libertinus Math;18;400;Regular;normal;;;LTR T 2768 w=9.7380 (nil) Mx 58.0438 My 259.6340 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 85 73 74 79 w=24.0048 (nil) Mx 84.4486 Mx 11.3760 @@ -281,7 +281,7 @@ Mx 253.5529 T 70 79 69 w=21.5280 (nil) Mx 275.0809 My 262.6580 -Set font Libertinus Math;10.8;400;Regular;normal;;;LTR +Set font Libertinus Math;10.8;400;Regular;normal;+ssty=2;;LTR T 85 73 74 79 w=18.0036 (nil) Mx 294.8845 Mx 8.5320 diff --git a/tests/math-stretchy.expected b/tests/math-stretchy.expected index b89f09f19..3808eff3d 100644 --- a/tests/math-stretchy.expected +++ b/tests/math-stretchy.expected @@ -25,7 +25,7 @@ T 3802 a=4.6500 (nil) Draw line 213.6217 50.1605 3.7200 0.6500 Mx 213.6385 My 47.6785 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 3411 w=3.6864 (nil) Mx 213.6217 My 57.8855 @@ -41,7 +41,7 @@ Mx 233.7315 T 2768 w=5.4100 (nil) Mx 239.1415 My 49.9855 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 243.2915 My 53.0855 @@ -95,7 +95,7 @@ Mx 294.9178 T 2768 w=5.4100 (nil) Mx 300.3278 My 89.4183 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 304.4778 My 93.1683 @@ -134,7 +134,7 @@ T 3802 a=4.6500 (nil) Draw line 195.4754 118.3363 3.7200 0.6500 Mx 195.4922 My 115.8543 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 3411 w=3.6864 (nil) Mx 195.4754 My 126.0613 @@ -150,7 +150,7 @@ Mx 215.5892 T 2768 w=5.4100 (nil) Mx 220.9992 My 118.1613 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 225.1492 My 121.2613 @@ -204,7 +204,7 @@ Mx 294.9178 T 2768 w=5.4100 (nil) Mx 300.3278 My 157.5941 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 304.4778 My 161.3441 diff --git a/tests/math-subsup.expected b/tests/math-subsup.expected index f6c9e6a41..02bcd7d43 100644 --- a/tests/math-subsup.expected +++ b/tests/math-subsup.expected @@ -23,7 +23,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2746 w=4.5400 (nil) Mx 189.2199 My 47.6905 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2768 w=4.1984 (nil) Mx 196.1054 My 50.7905 @@ -33,7 +33,7 @@ Mx 204.8425 T 2768 w=5.4100 (nil) Mx 209.4425 My 52.8905 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 215.8495 My 50.7905 @@ -43,7 +43,7 @@ Mx 224.5866 T 3411 w=4.8900 (nil) Mx 228.0666 My 53.3705 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 229.4766 My 46.9745 @@ -54,7 +54,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) Mx 237.4933 My 53.3705 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 19 w=7.4400 (nil) My 46.9745 T 18 21 w=7.4400 (nil) @@ -86,7 +86,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2746 w=4.5400 (nil) Mx 268.6758 My 80.2599 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2768 w=4.1984 (nil) Mx 275.5264 My 84.0099 @@ -96,7 +96,7 @@ Mx 284.2287 T 2768 w=5.4100 (nil) Mx 288.8287 My 86.1099 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 295.2009 My 84.0099 @@ -106,7 +106,7 @@ Mx 303.9031 T 3411 w=4.8900 (nil) Mx 307.3831 My 86.5899 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 308.7931 My 80.1939 @@ -117,7 +117,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) Mx 316.8098 My 86.5899 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 19 w=7.4400 (nil) My 80.1939 T 18 21 w=7.4400 (nil) @@ -148,7 +148,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2746 w=4.5400 (nil) Mx 171.0717 My 102.3480 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2768 w=4.1984 (nil) Mx 177.9592 My 105.4480 @@ -158,7 +158,7 @@ Mx 186.6983 T 2768 w=5.4100 (nil) Mx 191.2983 My 107.5480 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 197.7074 My 105.4480 @@ -168,7 +168,7 @@ Mx 206.4466 T 3411 w=4.8900 (nil) Mx 209.9266 My 108.0280 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 211.3366 My 101.6320 @@ -179,7 +179,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) Mx 219.3532 My 108.0280 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 19 w=7.4400 (nil) My 101.6320 T 18 21 w=7.4400 (nil) @@ -211,7 +211,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2746 w=4.5400 (nil) Mx 268.8008 My 134.8197 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2768 w=4.1984 (nil) Mx 275.6514 My 138.5697 @@ -221,7 +221,7 @@ Mx 284.3537 T 2768 w=5.4100 (nil) Mx 288.9537 My 140.6697 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 295.3259 My 138.5697 @@ -231,7 +231,7 @@ Mx 304.0281 T 3411 w=4.8900 (nil) Mx 307.5081 My 141.1497 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 308.9181 My 134.7537 @@ -242,7 +242,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 13 w=2.2000 (nil) Mx 316.9348 My 141.1497 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 19 w=7.4400 (nil) My 134.7537 T 18 21 w=7.4400 (nil) diff --git a/tests/math-tables-mathml.expected b/tests/math-tables-mathml.expected index 55063c30b..2e52b90b9 100644 --- a/tests/math-tables-mathml.expected +++ b/tests/math-tables-mathml.expected @@ -96,7 +96,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2765 w=4.9200 (nil) Mx 158.4643 My 142.8283 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 168.6143 My 140.7283 @@ -109,7 +109,7 @@ My 154.9883 T 2765 w=4.9200 (nil) Mx 158.4643 My 157.0883 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 168.6143 My 154.9883 @@ -122,7 +122,7 @@ My 169.6743 T 2765 w=4.9200 (nil) Mx 158.4515 My 171.7743 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 168.6143 My 169.6743 @@ -132,7 +132,7 @@ Mx 181.0943 T 2765 w=4.9200 (nil) Mx 185.6543 My 171.7743 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 189.3871 T 2088 w=5.1840 (nil) @@ -146,7 +146,7 @@ Mx 209.7137 T 2765 w=4.9200 (nil) Mx 214.2737 My 171.7743 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 218.0065 T 2088 w=5.1840 (nil) @@ -184,7 +184,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2765 w=4.9200 (nil) Mx 249.8991 My 201.1261 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 260.0491 My 199.0261 @@ -197,7 +197,7 @@ My 213.2861 T 2765 w=4.9200 (nil) Mx 249.8991 My 215.3861 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 260.0491 My 213.2861 @@ -210,7 +210,7 @@ My 227.9721 T 2765 w=4.9200 (nil) Mx 249.8863 My 230.0721 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 260.0491 My 227.9721 @@ -220,7 +220,7 @@ Mx 272.5291 T 2765 w=4.9200 (nil) Mx 277.0891 My 230.0721 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 280.8219 T 2088 w=5.1840 (nil) @@ -234,7 +234,7 @@ Mx 301.0803 T 2765 w=4.9200 (nil) Mx 305.6403 My 230.0721 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 309.3731 T 2088 w=5.1840 (nil) diff --git a/tests/math-tables-tex.expected b/tests/math-tables-tex.expected index 0c7122c6d..9dc9f8c3a 100644 --- a/tests/math-tables-tex.expected +++ b/tests/math-tables-tex.expected @@ -96,7 +96,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2765 w=4.9200 (nil) Mx 140.3160 My 142.8283 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 150.4660 My 140.7283 @@ -109,7 +109,7 @@ My 154.9883 T 2765 w=4.9200 (nil) Mx 140.3160 My 157.0883 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 150.4660 My 154.9883 @@ -122,7 +122,7 @@ My 169.6743 T 2765 w=4.9200 (nil) Mx 140.3032 My 171.7743 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 150.4660 My 169.6743 @@ -132,7 +132,7 @@ Mx 162.9460 T 2765 w=4.9200 (nil) Mx 167.5060 My 171.7743 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 171.2388 T 2088 w=5.1840 (nil) @@ -146,7 +146,7 @@ Mx 191.5694 T 2765 w=4.9200 (nil) Mx 196.1294 My 171.7743 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 199.8622 T 2088 w=5.1840 (nil) @@ -184,7 +184,7 @@ Set font Libertinus Math;10;400;Regular;normal;;;LTR T 2765 w=4.9200 (nil) Mx 249.8991 My 200.1740 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 17 w=3.7200 (nil) Mx 260.0491 My 198.0740 @@ -197,7 +197,7 @@ My 212.3340 T 2765 w=4.9200 (nil) Mx 249.8991 My 214.4340 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 18 w=3.7200 (nil) Mx 260.0491 My 212.3340 @@ -210,7 +210,7 @@ My 227.0200 T 2765 w=4.9200 (nil) Mx 249.8863 My 229.1200 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 260.0491 My 227.0200 @@ -220,7 +220,7 @@ Mx 272.5291 T 2765 w=4.9200 (nil) Mx 277.0891 My 229.1200 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 280.8219 T 2088 w=5.1840 (nil) @@ -234,7 +234,7 @@ Mx 301.0803 T 2765 w=4.9200 (nil) Mx 305.6403 My 229.1200 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 309.3731 T 2088 w=5.1840 (nil) diff --git a/tests/math-variants.expected b/tests/math-variants.expected index 3c850414f..d664b9014 100644 --- a/tests/math-variants.expected +++ b/tests/math-variants.expected @@ -33,7 +33,7 @@ Mx 211.9311 T 70 w=4.4700 (nil) Mx 216.4011 My 48.8745 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 220.5639 My 51.9745 @@ -65,7 +65,7 @@ Mx 2.8200 T 10 a=3.5600 (nil) Mx 297.3059 My 46.9745 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 49.7638 My 72.8485 @@ -108,7 +108,7 @@ Mx 294.6107 T 70 w=8.0460 (nil) Mx 302.6567 My 67.2685 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2758 w=6.7190 (nil) Mx 310.1497 My 72.8485 @@ -140,7 +140,7 @@ Mx 5.0760 T 10 a=6.4080 (nil) Mx 448.0697 My 63.8485 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 19 w=6.6960 (nil) Mx 49.7638 My 85.1788 @@ -176,7 +176,7 @@ Mx 272.1192 T 70 w=4.4700 (nil) Mx 276.5892 My 103.8323 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 280.7520 My 107.5823 @@ -208,7 +208,7 @@ Mx 2.8200 T 10 a=3.5600 (nil) Mx 357.2886 My 102.5823 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 49.7638 My 128.6643 @@ -252,7 +252,7 @@ Mx 251.7043 T 70 w=8.0460 (nil) Mx 259.7503 My 152.2218 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 2758 w=6.7190 (nil) Mx 267.2433 My 158.9718 @@ -284,7 +284,7 @@ Mx 5.0760 T 10 a=6.4080 (nil) Mx 405.0093 My 149.9718 -Set font Libertinus Math;14.4;400;Regular;normal;;;LTR +Set font Libertinus Math;14.4;400;Regular;normal;+ssty=1;;LTR T 19 w=6.6960 (nil) Mx 49.7638 My 182.6958 @@ -319,7 +319,7 @@ Mx 193.7972 T 70 w=4.4700 (nil) Mx 198.2672 My 179.5958 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 202.4300 My 182.6958 @@ -351,7 +351,7 @@ Mx 2.8200 T 10 a=3.5600 (nil) Mx 276.8279 My 177.6958 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 49.7638 My 194.6958 @@ -387,7 +387,7 @@ Mx 273.2992 T 70 w=4.4700 (nil) Mx 277.7692 My 213.3492 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 2758 w=3.7328 (nil) Mx 281.9320 My 217.0992 @@ -419,7 +419,7 @@ Mx 2.8200 T 10 a=3.5600 (nil) Mx 356.1086 My 212.0992 -Set font Libertinus Math;8;400;Regular;normal;;;LTR +Set font Libertinus Math;8;400;Regular;normal;+ssty=1;;LTR T 19 w=3.7200 (nil) Mx 295.2916 My 780.6177 diff --git a/tests/verbatim-lines.sil b/tests/verbatim-lines.sil index 9d7cc2d14..05e07b076 100644 --- a/tests/verbatim-lines.sil +++ b/tests/verbatim-lines.sil @@ -1,3 +1,4 @@ +% KNOWNBAD https://github.com/sile-typesetter/sile/issues/2168 \begin[papersize=a6]{document} \nofolios \neverindent