From 4097b52ea86a51c6e0172880ec89ee3d09ed8d10 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Feb 2022 21:26:52 +0000 Subject: luaotfload (27feb22) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62239 c570f23f-e606-0410-a88d-b1316a301751 --- .../luatex/luaotfload/fontloader-basics-gen.lua | 2 +- .../tex/luatex/luaotfload/luaotfload-auxiliary.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-colors.lua | 4 +- .../luatex/luaotfload/luaotfload-configuration.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-database.lua | 4 +- .../luatex/luaotfload/luaotfload-diagnostics.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-dvi.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-embolden.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-fallback.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-features.lua | 9 +- .../tex/luatex/luaotfload/luaotfload-filelist.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-glyphlist.lua | 4 +- .../luatex/luaotfload/luaotfload-harf-define.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-harf-plug.lua | 4 +- .../luatex/luaotfload/luaotfload-harf-var-cff2.lua | 4 +- .../luaotfload/luaotfload-harf-var-t2-writer.lua | 4 +- .../luatex/luaotfload/luaotfload-harf-var-ttf.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-init.lua | 4 +- .../luatex/luaotfload/luaotfload-letterspace.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-loaders.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-log.lua | 4 +- .../luatex/luaotfload/luaotfload-multiscript.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-notdef.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-parsers.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-resolvers.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-scripts.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-status.lua | 62 ++++----- .../tex/luatex/luaotfload/luaotfload-suppress.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-szss.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-t3.lua | 142 --------------------- .../tex/luatex/luaotfload/luaotfload-tounicode.lua | 4 +- .../tex/luatex/luaotfload/luaotfload-unicode.lua | 4 +- .../tex/luatex/luaotfload/luaotfload.lua | 4 +- .../tex/luatex/luaotfload/luaotfload.sty | 2 +- 34 files changed, 97 insertions(+), 236 deletions(-) delete mode 100644 Master/texmf-dist/tex/luatex/luaotfload/luaotfload-t3.lua (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-basics-gen.lua b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-basics-gen.lua index 1cc8537168b..5a6e90ceee7 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/fontloader-basics-gen.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/fontloader-basics-gen.lua @@ -189,7 +189,7 @@ local readables = { } local usingjit = jit if not caches.namespace or caches.namespace == "" or caches.namespace == "context" then - caches.namespace = 'generic-dev' + caches.namespace = 'generic' end do diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua index 86aff98fb4f..379ad5bb788 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-auxiliary.lua @@ -6,8 +6,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-auxiliary", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / auxiliary functions", license = "GPL v2.0" } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-colors.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-colors.lua index e0bd759de58..8371de72225 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-colors.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-colors.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-colors", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / color", license = "GPL v2.0", author = "Khaled Hosny, Elie Roux, Philipp Gesang, Dohyun Kim, David Carlisle", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-configuration.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-configuration.lua index 50618d72af1..b970ce353e1 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-configuration.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-configuration.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-configuration", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / config file reader", license = "GPL v2.0" } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua index 8f0ef41fc73..8d981a3f2c4 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua @@ -5,8 +5,8 @@ do -- block to avoid to many local variables error assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-database", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / database", license = "GPL v2.0", author = "Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-diagnostics.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-diagnostics.lua index 622714d14b1..230384f981c 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-diagnostics.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-diagnostics.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-diagnostics", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload-tool submodule / diagnostics", license = "GPL v2.0" } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-dvi.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-dvi.lua index 2f8abefa937..75f6564d422 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-dvi.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-dvi.lua @@ -6,8 +6,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-dvi", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / DVI", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-embolden.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-embolden.lua index d0a2e60555e..bca6eb45d85 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-embolden.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-embolden.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-embolden", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / embolden", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fallback.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fallback.lua index a3f28e77a4a..b45f454576e 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fallback.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-fallback.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-fallback", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / fallback", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua index eecf1aa0f59..d297061a7d5 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-features.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-features", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / features", license = "GPL v2.0", author = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger", @@ -843,7 +843,10 @@ local normalize_lookup = setmetatable({}, {__index = function(t, f) t[fontdir] = result return result end}) -local normalize_funcs = { +-- When this is loaded as part of luaotfload-tool, then we can't access nodes +-- and therefore uni_normalize doesn't exists. In that case we don't need it +-- anyway, so just skip it then. +local normalize_funcs = uni_normalize and { nfc = uni_normalize.NFC, nfd = uni_normalize.NFD, nfkd = uni_normalize.NFKD, diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-filelist.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-filelist.lua index abd6458db97..d0b1530830f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-filelist.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-filelist.lua @@ -6,8 +6,8 @@ if luaotfload_module then luaotfload_module { name = "luaotfload-filelist", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / filelist", license = "GPL v2.0" } end diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-glyphlist.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-glyphlist.lua index ce3cc314b40..f291b2d60e0 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-glyphlist.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-glyphlist.lua @@ -1,8 +1,8 @@ if luaotfload_module then luaotfload_module { name = "luaotfload-glyphlist", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / autogenerated glyphlist", copyright = "derived from https://raw.githubusercontent.com/adobe-type-tools/agl-aglfn/master/glyphlist.txt", original = "Adobe Glyph List, version 2.0, September 20, 2002", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-define.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-define.lua index d7ee7c11bb1..add95cdf68c 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-define.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-define.lua @@ -5,8 +5,8 @@ do -- block to avoid to many local variables error assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-define", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / HarfBuzz font loading", license = "GPL v2.0", author = "Khaled Hosny, Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-plug.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-plug.lua index 634da687860..222c4334e8a 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-plug.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-plug.lua @@ -4,8 +4,8 @@ ----------------------------------------------------------------------- assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-plug", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / HarfBuzz shaping", license = "GPL v2.0", author = "Khaled Hosny, Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-cff2.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-cff2.lua index 9c05b7a6c72..38fa6b57d94 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-cff2.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-cff2.lua @@ -5,8 +5,8 @@ do assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-var-cff2", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / CFF2 table processing", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-t2-writer.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-t2-writer.lua index f10bf6d860e..5964b618655 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-t2-writer.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-t2-writer.lua @@ -5,8 +5,8 @@ do assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-var-t2-writer", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / Type 2 charstring writer", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-ttf.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-ttf.lua index 80cf6768ae6..41fb4121029 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-ttf.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-harf-var-ttf.lua @@ -5,8 +5,8 @@ do assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-var-ttf", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / gvar table processing", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-init.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-init.lua index 73a6544e728..3d00816e1ac 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-init.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-init.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-init", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / initialization", license = "GPL v2.0" } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-letterspace.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-letterspace.lua index 2e69cb92a6b..bb5a4a5e706 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-letterspace.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-letterspace.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-letterspace", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / letterspacing", license = "GPL v2.0", copyright = "PRAGMA ADE / ConTeXt Development Team", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-loaders.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-loaders.lua index 5a84113a1f0..ca3730f00d9 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-loaders.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-loaders.lua @@ -8,8 +8,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-loaders", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / callback handling", license = "GPL v2.0" } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua index 41f9f4b8774..c4ecd750756 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-log.lua @@ -6,8 +6,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-log", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / logging", license = "GPL v2.0", author = "Khaled Hosny, Elie Roux, Philipp Gesang", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-multiscript.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-multiscript.lua index ab688fe704c..9b3b3fd8368 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-multiscript.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-multiscript.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-multiscript", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / multiscript", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-notdef.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-notdef.lua index 28a371dd35e..e32521daea2 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-notdef.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-notdef.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-notdef", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / notdef", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua index 099363fad55..da41fa8b302 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-parsers.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-parsers", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / parsers", license = "GPL v2.0" } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua index a91216b79d8..5d3f456739f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua @@ -11,8 +11,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-resolvers", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / resolvers", license = "GPL v2.0" } diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-scripts.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-scripts.lua index c3c918ef3b8..2accacfd649 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-scripts.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-scripts.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-script", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / Script helpers", license = "CC0 1.0 Universal", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua index d722bfe03b6..02286a891b0 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-status.lua @@ -54,46 +54,46 @@ return { { "fontloader-font-ini.lua", "5343de60613adb24cdd7a8d2ee1d153c" }, { "fontloader-data-con.lua", "23a0f5386d46a1c157ae82a373e35fa0" }, { "fontloader-reference.lua", "066680a4fe38fad14eb27f56d4616104" }, - { "fontloader-basics-gen.lua", "e470c13b1ed41e38932e93518219ad74" }, + { "fontloader-basics-gen.lua", "4bc43036e9796fccb0b8869f4b05bf2e" }, { "mktests", "918cb50be9ee8bd645ac1a27dc501e8c" }, - { "mkstatus", "3a71ea95e4daeac77ead843edb0ce283" }, + { "mkstatus", "a49a287defff8b8241faedb7c6a45621" }, { "mkcharacters", "bfca0e96e1e351afe7077502f9595af9" }, { "mkglyphlist", "7a8a8fdc0eac7fac2f13ec8f4e8e7aa9" }, { "mkimport", "7d62f1042e548f8b9368f26b9ba4be5c" }, - { "luaotfload-glyphlist.lua", "dc0ed15ca157aec56a509819d4c24046" }, + { "luaotfload-glyphlist.lua", "37275559314b6ced2c01f0d0e58fd68f" }, { "luaotfload-characters.lua", "76415ca3ede312cad6e09038323489ae" }, - { "luaotfload-dvi.lua", "f4e4d6cc443f477820521abcd87ef3f8" }, - { "luaotfload-tounicode.lua", "79795ade0ccdb99cd5e6cf989770db69" }, - { "luaotfload-unicode.lua", "68904dd143491dc0a4a1c0a063a118f9" }, - { "luaotfload-resolvers.lua", "1e844bc5d9b3d207f8914a11254afd67" }, - { "luaotfload-parsers.lua", "b0c087c6dbf75939d7be9523b7a0ca34" }, - { "luaotfload-fallback.lua", "88ed544bc0429f94606f72dace5704f0" }, - { "luaotfload-szss.lua", "7266e9d2122fb0785b595f9605627640" }, - { "luaotfload-scripts.lua", "c6c11811531c7e42194304d65bed7877" }, - { "luaotfload-multiscript.lua", "f9d7bedf75629d83f8d99397d15fdf86" }, - { "luaotfload-loaders.lua", "b2ef32297527eec59131de3b56f4d846" }, - { "luaotfload-harf-plug.lua", "7f3739c1b32de1f8e76275c317f5ed9a" }, - { "luaotfload-harf-define.lua", "1c2ce18281caede23d93c8b825df7239" }, - { "luaotfload-notdef.lua", "8b448aed817a764b675d1ead6bf932a7" }, - { "luaotfload-embolden.lua", "00ae296b36724c4f8dd4da62051039b2" }, - { "luaotfload-letterspace.lua", "f98fbda3ea174058b515b9234dfba495" }, - { "luaotfload-features.lua", "5c0d7d66953c7ecdd2a610d758d70f0d" }, - { "luaotfload-database.lua", "2ac2d6e5960257a7c5688c931bb91924" }, - { "luaotfload-configuration.lua", "05e6c5032b9ac6f05230d06c866161d6" }, - { "luaotfload-colors.lua", "3e1cd496c920d0e8296a9e99357f27eb" }, - { "luaotfload-auxiliary.lua", "32c6b48ab66a2ddf2a7d3063529e85f8" }, - { "luaotfload-filelist.lua", "b80ed418d9d297370182e9fcc9e497e5" }, - { "luaotfload-tool.lua", "2a6a1c510e44c4432724657259b12cbf" }, - { "luaotfload-diagnostics.lua", "e831068d26e0266cd081de8585c3cbc9" }, - { "luaotfload-log.lua", "889508edccd01035ecbeafdeeff60e35" }, - { "luaotfload-init.lua", "56ac12fac2e63d1a901463850062dd58" }, + { "luaotfload-dvi.lua", "17763f980ea431ef33578799e36121bd" }, + { "luaotfload-tounicode.lua", "861919847a52fcbe4e625c8cda7826a2" }, + { "luaotfload-unicode.lua", "5c90a8c752518c7eae0aa21f5d4e6cb5" }, + { "luaotfload-resolvers.lua", "a3a547c332dcc51885b6611debcecb53" }, + { "luaotfload-parsers.lua", "90411c0301b37730abb40a8b49507c8f" }, + { "luaotfload-fallback.lua", "febc05a8a5701b4e9b73a9a24e994f33" }, + { "luaotfload-szss.lua", "256bc3115f09638b0acdf4f59b06e4d1" }, + { "luaotfload-scripts.lua", "9356ba71cf8a174e8e592213aa680297" }, + { "luaotfload-multiscript.lua", "8f77beea00a1319d53e10ce95f6cc561" }, + { "luaotfload-loaders.lua", "b0b23c070c570d81a32913d2afc1bb2a" }, + { "luaotfload-harf-plug.lua", "098a6a6f9c17d2a99a76ce890e8c9dc6" }, + { "luaotfload-harf-define.lua", "0d8692db5d29664eb32e6c5fb25b049f" }, + { "luaotfload-notdef.lua", "c323ab19ea5e81c5c9c4bbbc6d62839a" }, + { "luaotfload-embolden.lua", "50aa1bdac170cdb287345b9532520cbf" }, + { "luaotfload-letterspace.lua", "79d2efd35a43d1bfba84ce7c5a211680" }, + { "luaotfload-features.lua", "2348361d796bde017da72421a0e68ce6" }, + { "luaotfload-database.lua", "d37c8efaed4dbe9bb566cbd8e9ba9216" }, + { "luaotfload-configuration.lua", "cfdee94e34f3294b8ef627086ac464a3" }, + { "luaotfload-colors.lua", "01070f297400b9d0bb94a321b16a3cc6" }, + { "luaotfload-auxiliary.lua", "2a69d5f008d6c79b703ea6bd88f545f3" }, + { "luaotfload-filelist.lua", "261c4306787e506da0ca5c15b09913f5" }, + { "luaotfload-tool.lua", "252bdfdf017c7b2a1e1a92d129de05c2" }, + { "luaotfload-diagnostics.lua", "146886b07d0f4f57b82ed77407d32066" }, + { "luaotfload-log.lua", "7856e6afce049f6196ef94b2d2057ff6" }, + { "luaotfload-init.lua", "3c3b19cd2f8bbbd8bdbc99c50535bff7" }, { "luaotfload-main.lua", "b19c9cc34cf1d676c39f872cfb41aef6" }, }, ["notes"]={ ["committer"]="Marcel Fabian Krüger ", - ["description"]="v3.19/2022-02-24", + ["description"]="v3.20/2022-02-27", ["loader"]="fontloader-2022-02-24.lua", - ["revision"]="ef3a55e0da3709e95551c62376f31149771dcc18", - ["timestamp"]="2022-02-24 14:16:28 +0100", + ["revision"]="b6b01d231706a79c8456c4c890d62a65897b49e1", + ["timestamp"]="2022-02-27 14:15:30 +0100", }, } \ No newline at end of file diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-suppress.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-suppress.lua index e0f3989c22a..b0ba8dccc16 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-suppress.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-suppress.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-suppress", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / suppress", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-szss.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-szss.lua index dcd8eacf65b..6786226257a 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-szss.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-szss.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-szss", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / Special feature handling", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-t3.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-t3.lua deleted file mode 100644 index 2588346724f..00000000000 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-t3.lua +++ /dev/null @@ -1,142 +0,0 @@ ------------------------------------------------------------------------ --- FILE: luaotfload-t3.lua --- DESCRIPTION: part of luaotfload / Type 3 ------------------------------------------------------------------------ -do -- block to avoid to many local variables error - assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { - name = "luaotfload-t3", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE - description = "luaotfload submodule / Type 3 font handling", - license = "GPL v2.0", - author = "Marcel Krüger", - copyright = "Luaotfload Development Team", - } -end - ---[[ -local function u8_to_utf16be(s) - local d = {} - local i = 0 - for _, cp, cp2 in utf8.codes(s) do - i = i + 1 - if cp > 0x10000 then - cp = cp - 0x10000 - local high = (cp>>10) | 0xD800 - local low = (cp&0x3FF) | 0xDC00 - d[i] = string.format('%04X%04X', high, low) - else - d[i] = string.format('%04X', cp) - end - end - return table.concat(d, '', 1, i) -end -]] - -local function t3factory(basename, designsize, callback) - local count = 0 - local gid_to_t3 = {} - local t3_to_gid = {} - return function(size) - local fids = {} - return function(gid, width, unicode) - local t3id = gid_to_t3[gid] - if not t3id then - t3id = count - count = count + 1 - gid_to_t3[gid] = t3id - t3_to_gid[t3id] = gid - end - local t3fid, t3cid = t3id >> 8, ~(t3id & 0xFF) - local fid = fids[t3fid + 1] - local fontdir = fid and font.getfont(fid) - local characters = fontdir and fontdir.characters - if not (characters and characters[t3cid]) then - characters = characters or {} - -- First create the character - local char = { - width = width, - height = 0, -- We never look at these two anyway - depth = 0, - tounicode = unicode, - } - characters[t3cid] = char - if fid then -- Font already exists - font.addcharacters(fid, { - characters = { - [t3cid] = char, - }, - }) - else - fontdir = { - name = basename .. '_' .. basesize .. '_' .. t3fid, - format = 'type3', - psname = 'none', - filename = 'not_a_real_filename', -- Can't be null to ensure reuse - fullname = basename .. basesize .. '_' .. t3fid, - characters = characters, - designsize = basesize, - size = size, - cidinfo = {}, -- Can't be null to ensure reuse - attributes = '/FontDescriptor<<\z - /Type/FontDescriptor\z - /FontName/VirtualLuaFont\z - /Flags 4\z - /ItalicAngle 0\z - >>', -- TODO: Needs work - t3_handler = function(stage, _, cid) - cid = cid and assert(t3_to_gid[(t3fid << 8) | ~cid]) - return callback(stage, cid) - end - } - fid = font.define(fontdir) - fids[t3fid + 1] = fid - end - end - vf.font(fid) - vf.char(t3cid) - end - end -end - -luatexbase.add_to_callback('provide_charproc_data', function(stage, fid, ...) - local fontdir = font.getfont(fid) - if not fontdir then error'Unknown font' end - local handler = fontdir.t3_handler - if not handler then error'Missing t3handler in Type 3 font' end - return handler(stage, fid, ...) -end, 'luaotfload.t3') - -return t3factory ---[===[ - function callback(stage, cid) - if stage == 1 then - local char = assert(characters[cid]) - local head = assert(char.head) - local resource = tex.saveboxresource(head, nil--[[attributes]], nil--[[resources]], true--[[immediate]], 0--[[mode]], nil--[[margin]]) - local name = string.format('/F%i', pdf.getxformname(resource)) - local resources = characters.resources - if resources then - characters.resources = string.format('%s %s %i 0 R', resources, name, resource) - else - characters.resources = string.format('%s %i 0 R', name, resource) - end - char.resource = name - elseif stage == 2 then - local char = assert(characters[cid]) - width = char.width/65781 - return pdf.obj{ - type = 'stream', - immediate = true, - -- objnum = - -- attr = - -- compresslevel = - string = string.format('%g 0 d0 %s Do', width, char.resource) - }, width - elseif stage == 3 then - return 65781/655360, string.format('/XObject<<%s>>', characters.resources) - end - print(stage, fid, cid) - end, - } -]===] diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-tounicode.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-tounicode.lua index 09ca40adbe4..9ef921ffd0f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-tounicode.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-tounicode.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-tounicode", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / tounicode", license = "GPL v2.0", author = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger", diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-unicode.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-unicode.lua index 25a7b2046eb..d63d16989cc 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-unicode.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-unicode.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-unicode", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "luaotfload submodule / Unicode helpers", license = "CC0 1.0 Universal", author = "Marcel Krüger" diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua index f21ded5ae62..20eaad3eff4 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.lua @@ -20,8 +20,8 @@ local authors = "\z -- version number is used below! local ProvidesLuaModule = { name = "luaotfload", - version = "3.19", --TAGVERSION - date = "2022-02-24", --TAGDATE + version = "3.20", --TAGVERSION + date = "2022-02-27", --TAGDATE description = "Lua based OpenType font support", author = authors, copyright = authors, diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty index 7dbccb1f8c4..2426c2e0f50 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload.sty @@ -39,7 +39,7 @@ \fi \ifdefined\ProvidesPackage \ProvidesPackage{luaotfload}% - [2022/02/24 v3.19 OpenType layout system] + [2022/02/27 v3.20 OpenType layout system] \fi \directlua{ if xpcall(function ()% -- cgit v1.2.3