[latex3-commits] [git/LaTeX3-latex3-lualibs] test-v2.73: imported context files and update version (d750b30)
Ulrike Fischer
fischer at troubleshooting-tex.de
Wed Dec 30 17:56:44 CET 2020
Repository : https://github.com/latex3/lualibs
On branch : test-v2.73
Link : https://github.com/latex3/lualibs/commit/d750b30c9b39dbf72e6c090b2fa0b1dd915e1baa
>---------------------------------------------------------------
commit d750b30c9b39dbf72e6c090b2fa0b1dd915e1baa
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Wed Dec 30 17:56:44 2020 +0100
imported context files and update version
>---------------------------------------------------------------
d750b30c9b39dbf72e6c090b2fa0b1dd915e1baa
CTANREADME.md | 6 +++---
NEWS | 3 +++
README.md | 6 +++---
build.lua | 6 +++---
lualibs-basic-merged.lua | 29 ++++++++++++++++++++++-------
lualibs-extended-merged.lua | 6 +-----
lualibs-os.lua | 2 ++
lualibs-package.lua | 24 ++++++++++++++++++------
lualibs-unicode.lua | 2 +-
lualibs-util-dim.lua | 18 +++++++++---------
lualibs.dtx | 18 +++++++++---------
11 files changed, 74 insertions(+), 46 deletions(-)
diff --git a/CTANREADME.md b/CTANREADME.md
index 3519300..cf330df 100644
--- a/CTANREADME.md
+++ b/CTANREADME.md
@@ -1,10 +1,10 @@
# The Lualibs Package
-VERSION: 2.72
+VERSION: 2.73
-DATE: 2020-08-31
+DATE: 2020-12-30
-FONTLOADERDATE: 2020-08-31
+FONTLOADERDATE: 2020-12-30
Lualibs is a collection of Lua modules useful for general programming.
diff --git a/NEWS b/NEWS
index af54318..4c80d06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
History of the lualibs package
+2020/12/30 v2.73/
+ * sync with Context current as of 2020/12/30.
+
2020/08/31 v2.72/
* sync with Context current as of 2020/08/31.
diff --git a/README.md b/README.md
index 5e075dc..c27df49 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# The Lualibs Package
-
-
+
+
[](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
@@ -15,7 +15,7 @@ This package has been developed by the LuaLaTeX development team on
<http://github.com/lualatex/lualibs>.
The current version has been build by the LaTeX3 Project Team on
-<https://github.com/latex3/lualibs/> from context 2020-08-31.
+<https://github.com/latex3/lualibs/> from context 2020-12-30.
Please see the documentation lualibs.pdf for more information.
diff --git a/build.lua b/build.lua
index be0d9b5..7b7e7d7 100644
--- a/build.lua
+++ b/build.lua
@@ -1,7 +1,7 @@
-- Build script for lualibs
-packageversion= "2.72"
-packagedate= "2020-08-31"
-fontloaderdate= "2020-08-31" -- only as record.
+packageversion= "2.73"
+packagedate= "2020-12-30"
+fontloaderdate= "2020-12-30" -- only as record.
module = "lualibs"
ctanpkg = "lualibs"
diff --git a/lualibs-basic-merged.lua b/lualibs-basic-merged.lua
index 147cc33..b288b18 100644
--- a/lualibs-basic-merged.lua
+++ b/lualibs-basic-merged.lua
@@ -1,6 +1,6 @@
-- merged file : lualibs-basic-merged.lua
-- parent file : lualibs-basic.lua
--- merge date : Mon Aug 31 23:16:26 2020
+-- merge date : Wed Dec 30 17:55:54 2020
do -- begin closure to overcome local limits and interference
@@ -358,7 +358,10 @@ methods["already loaded"]=function(name)
return package.loaded[name]
end
methods["preload table"]=function(name)
- return builtin["preload table"](name)
+ local f=builtin["preload table"]
+ if f then
+ return f(name)
+ end
end
methods["qualified path"]=function(name)
return loadedbyname(addsuffix(lualibfile(name),"lua"),name)
@@ -370,15 +373,24 @@ methods["lib extra list"]=function(name)
return loadedbypath(addsuffix(lualibfile(name),os.libsuffix),name,getextralibpaths(),true,"lib")
end
methods["path specification"]=function(name)
- getluapaths()
- return builtin["path specification"](name)
+ local f=builtin["path specification"]
+ if f then
+ getluapaths()
+ return f(name)
+ end
end
methods["cpath specification"]=function(name)
- getlibpaths()
- return builtin["cpath specification"](name)
+ local f=builtin["cpath specification"]
+ if f then
+ getlibpaths()
+ return f(name)
+ end
end
methods["all in one fallback"]=function(name)
- return builtin["all in one fallback"](name)
+ local f=builtin["all in one fallback"]
+ if f then
+ return f(name)
+ end
end
methods["not loaded"]=function(name)
if helpers.trace then
@@ -3358,6 +3370,8 @@ elseif name=="macosx" then
platform="osx-intel"
elseif find(architecture,"x86_64",1,true) then
platform="osx-64"
+ elseif find(architecture,"arm64",1,true) then
+ platform="osx-64"
else
platform="osx-ppc"
end
@@ -4684,6 +4698,7 @@ if not modules then modules={} end modules ['l-unicode']={
license="see context related readme files"
}
utf=utf or {}
+unicode=nil
if not string.utfcharacters then
local gmatch=string.gmatch
function string.characters(str)
diff --git a/lualibs-extended-merged.lua b/lualibs-extended-merged.lua
index 89d384a..cac8889 100644
--- a/lualibs-extended-merged.lua
+++ b/lualibs-extended-merged.lua
@@ -1,6 +1,6 @@
-- merged file : lualibs-extended-merged.lua
-- parent file : lualibs-extended.lua
--- merge date : Mon Aug 31 23:16:16 2020
+-- merge date : Wed Dec 30 17:55:44 2020
do -- begin closure to overcome local limits and interference
@@ -2700,8 +2700,6 @@ local dimenfactors=allocate {
["pc"]=(1/12)/65536,
["dd"]=(1157/1238)/65536,
["cc"]=(1157/14856)/65536,
- ["nd"]=(20320/21681)/65536,
- ["nc"]=(5080/65043)/65536
}
local f_none=formatters["%s%s"]
local f_true=formatters["%0.5F%s"]
@@ -2733,8 +2731,6 @@ function number.tobasepoints (n,fmt) return numbertodimen(n,"bp",fmt) end
function number.topicas (n,fmt) return numbertodimen(n "pc",fmt) end
function number.todidots (n,fmt) return numbertodimen(n,"dd",fmt) end
function number.tociceros (n,fmt) return numbertodimen(n,"cc",fmt) end
-function number.tonewdidots (n,fmt) return numbertodimen(n,"nd",fmt) end
-function number.tonewciceros (n,fmt) return numbertodimen(n,"nc",fmt) end
local amount=(S("+-")^0*R("09")^0*P(".")^0*R("09")^0)+Cc("0")
local unit=R("az")^1+P("%")
local dimenpair=amount/tonumber*(unit^1/dimenfactors+Cc(1))
diff --git a/lualibs-os.lua b/lualibs-os.lua
index 1e01350..7384107 100644
--- a/lualibs-os.lua
+++ b/lualibs-os.lua
@@ -358,6 +358,8 @@ elseif name == "macosx" then
platform = "osx-intel"
elseif find(architecture,"x86_64",1,true) then
platform = "osx-64"
+ elseif find(architecture,"arm64",1,true) then
+ platform = "osx-64"
else
platform = "osx-ppc"
end
diff --git a/lualibs-package.lua b/lualibs-package.lua
index 94607d4..a35ec3e 100644
--- a/lualibs-package.lua
+++ b/lualibs-package.lua
@@ -300,7 +300,10 @@ methods["already loaded"] = function(name)
end
methods["preload table"] = function(name)
- return builtin["preload table"](name)
+ local f = builtin["preload table"]
+ if f then
+ return f(name)
+ end
end
methods["qualified path"]=function(name)
@@ -316,17 +319,26 @@ methods["lib extra list"] = function(name)
end
methods["path specification"] = function(name)
- getluapaths() -- triggers list building and tracing
- return builtin["path specification"](name)
+ local f = builtin["path specification"]
+ if f then
+ getluapaths() -- triggers list building and tracing
+ return f(name)
+ end
end
methods["cpath specification"] = function(name)
- getlibpaths() -- triggers list building and tracing
- return builtin["cpath specification"](name)
+ local f = builtin["cpath specification"]
+ if f then
+ getlibpaths() -- triggers list building and tracing
+ return f(name)
+ end
end
methods["all in one fallback"] = function(name)
- return builtin["all in one fallback"](name)
+ local f = builtin["all in one fallback"]
+ if f then
+ return f(name)
+ end
end
methods["not loaded"] = function(name)
diff --git a/lualibs-unicode.lua b/lualibs-unicode.lua
index 5d9a714..03016ed 100644
--- a/lualibs-unicode.lua
+++ b/lualibs-unicode.lua
@@ -32,7 +32,7 @@ if not modules then modules = { } end modules ['l-unicode'] = {
-- dump, find, format, gfind, gmatch, gsub, lower, match, rep, reverse, upper
utf = utf or { }
--- unicode = nil
+unicode = nil
if not string.utfcharacters then
diff --git a/lualibs-util-dim.lua b/lualibs-util-dim.lua
index 76b5fd2..bb9eca9 100644
--- a/lualibs-util-dim.lua
+++ b/lualibs-util-dim.lua
@@ -44,8 +44,8 @@ local dimenfactors = allocate {
["pc"] = ( 1/ 12)/65536,
["dd"] = ( 1157/ 1238)/65536,
["cc"] = ( 1157/14856)/65536,
- ["nd"] = (20320/21681)/65536,
- ["nc"] = ( 5080/65043)/65536
+ -- ["nd"] = (20320/21681)/65536,
+ -- ["nc"] = ( 5080/65043)/65536
}
-- print(table.serialize(dimenfactors))
@@ -61,9 +61,9 @@ local dimenfactors = allocate {
-- ["ex"]=6.103515625e-005,
-- ["in"]=2.1113586636917117e-007,
-- ["mm"]=5.3628510057769473e-008,
--- ["nc"]=1.1917446679504327e-006,
--- ["nd"]=1.4300936015405194e-005,
--- ["pc"]=1.2715657552083333e-006,
+-- --["nc"]=1.1917446679504327e-006,
+-- --["nd"]=1.4300936015405194e-005,
+-- --["pc"]=1.2715657552083333e-006,
-- ["pt"]=1.52587890625e-005,
-- ["sp"]=1,
-- }
@@ -79,8 +79,8 @@ local dimenfactors = allocate {
-- ["ex"]=0.00006103515625,
-- ["in"]=0.00000021113587,
-- ["mm"]=0.00000005362851,
--- ["nc"]=0.00000119174467,
--- ["nd"]=0.00001430093602,
+-- --["nc"]=0.00000119174467,
+-- --["nd"]=0.00001430093602,
-- ["pc"]=0.00000127156576,
-- ["pt"]=0.00001525878906,
-- ["sp"]=1,
@@ -128,8 +128,8 @@ function number.tobasepoints (n,fmt) return numbertodimen(n,"bp",fmt) end
function number.topicas (n,fmt) return numbertodimen(n "pc",fmt) end
function number.todidots (n,fmt) return numbertodimen(n,"dd",fmt) end
function number.tociceros (n,fmt) return numbertodimen(n,"cc",fmt) end
-function number.tonewdidots (n,fmt) return numbertodimen(n,"nd",fmt) end
-function number.tonewciceros (n,fmt) return numbertodimen(n,"nc",fmt) end
+-------- number.tonewdidots (n,fmt) return numbertodimen(n,"nd",fmt) end
+-------- number.tonewciceros (n,fmt) return numbertodimen(n,"nc",fmt) end
--[[ldx--
<p>More interesting it to implement a (sort of) dimen datatype, one
diff --git a/lualibs.dtx b/lualibs.dtx
index c98c752..7246e85 100644
--- a/lualibs.dtx
+++ b/lualibs.dtx
@@ -37,7 +37,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: lualibs 2020-08-31 v2.72 Lua additional functions.}
+\Msg{* Package: lualibs 2020-12-30 v2.73 Lua additional functions.}
\Msg{************************************************************************}
\keepsilent
@@ -107,7 +107,7 @@ and lualibs-extended.lua.
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{lualibs.drv}
- [2020/08/31 v2.72 Lua Libraries.]
+ [2020/12/30 v2.73 Lua Libraries.]
\documentclass{ltxdoc}
\usepackage{fancyvrb,xspace}
\usepackage[x11names]{xcolor}
@@ -208,7 +208,7 @@ and lualibs-extended.lua.
% \GetFileInfo{lualibs.drv}
%
% \title{The \identifier{lualibs} package}
-% \date{2020/08/31 v2.72}
+% \date{2020/12/30 v2.73}
% \author{Élie Roux · \email{elie.roux at telecom-bretagne.eu}\\
% Philipp Gesang · \email{phg at phi-gamma.net}\\
% The \LaTeX3 Project · \email{https://github.com/latex3/lualibs/}\\
@@ -429,8 +429,8 @@ lualibs = lualibs or { }
lualibs.module_info = {
name = "lualibs",
- version = "2.72", --TAGVERSION
- date = "2020-08-31", --TAGDATE
+ version = "2.73", --TAGVERSION
+ date = "2020-12-30", --TAGDATE
description = "ConTeXt Lua standard libraries.",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
@@ -583,8 +583,8 @@ local loadmodule = lualibs.loadmodule
local lualibs_basic_module = {
name = "lualibs-basic",
- version = "2.72", --TAGVERSION
- date = "2020-08-31", --TAGDATE
+ version = "2.73", --TAGVERSION
+ date = "2020-12-30", --TAGDATE
description = "ConTeXt Lua libraries -- basic collection.",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
@@ -665,8 +665,8 @@ lualibs = lualibs or { }
local lualibs_extended_module = {
name = "lualibs-extended",
- version = "2.72", --TAGVERSION
- date = "2020-08-31", --TAGDATE
+ version = "2.73", --TAGVERSION
+ date = "2020-12-30", --TAGDATE
description = "ConTeXt Lua libraries -- extended collection.",
author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang",
copyright = "PRAGMA ADE / ConTeXt Development Team",
More information about the latex3-commits
mailing list.