From c0f152092e12b8eb497c5d9e206a8fc1ad9ed5c2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 Feb 2019 22:22:22 +0000 Subject: lualibs (25feb19) git-svn-id: svn://tug.org/texlive/trunk@50130 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/lualibs/NEWS | 3 +++ Master/texmf-dist/doc/luatex/lualibs/README | 4 ++-- Master/texmf-dist/doc/luatex/lualibs/lualibs.pdf | Bin 80649 -> 80558 bytes Master/texmf-dist/source/luatex/lualibs/lualibs.dtx | 18 +++++++++--------- .../tex/luatex/lualibs/lualibs-basic-merged.lua | 2 +- .../texmf-dist/tex/luatex/lualibs/lualibs-basic.lua | 4 ++-- .../tex/luatex/lualibs/lualibs-extended-merged.lua | 3 ++- .../tex/luatex/lualibs/lualibs-extended.lua | 4 ++-- .../tex/luatex/lualibs/lualibs-unicode.lua | 2 +- .../tex/luatex/lualibs/lualibs-util-sta.lua | 14 +++++++------- .../tex/luatex/lualibs/lualibs-util-str.lua | 13 +++++++++++++ Master/texmf-dist/tex/luatex/lualibs/lualibs.lua | 4 ++-- 12 files changed, 44 insertions(+), 27 deletions(-) diff --git a/Master/texmf-dist/doc/luatex/lualibs/NEWS b/Master/texmf-dist/doc/luatex/lualibs/NEWS index 87c4136cf24..cfa5f686ec9 100644 --- a/Master/texmf-dist/doc/luatex/lualibs/NEWS +++ b/Master/texmf-dist/doc/luatex/lualibs/NEWS @@ -1,4 +1,7 @@ History of the lualibs package +2019/02/14 v2.64/ + * sync with Context beta as of 2019/02/14 + 2019/01/28 v2.63/ * sync with Context beta as of 2019/01/28 diff --git a/Master/texmf-dist/doc/luatex/lualibs/README b/Master/texmf-dist/doc/luatex/lualibs/README index 865560d628e..b4f3bca07d9 100644 --- a/Master/texmf-dist/doc/luatex/lualibs/README +++ b/Master/texmf-dist/doc/luatex/lualibs/README @@ -11,8 +11,8 @@ for use independent of ConTeXt. This package has been developed by the LuaLaTeX development team on . -The current verson 2.63 has been build by Ulrike Fischer on - from context 2019-01-28. +The current verson 2.64 has been build by Ulrike Fischer on + from context 2019-02-14. See the 'NEWS' file for version history. diff --git a/Master/texmf-dist/doc/luatex/lualibs/lualibs.pdf b/Master/texmf-dist/doc/luatex/lualibs/lualibs.pdf index 4fbc060379c..b1673504856 100644 Binary files a/Master/texmf-dist/doc/luatex/lualibs/lualibs.pdf and b/Master/texmf-dist/doc/luatex/lualibs/lualibs.pdf differ diff --git a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx index e469a4b8b39..019963a7378 100644 --- a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx +++ b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx @@ -37,7 +37,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: lualibs 2019-01-28 v2.63 Lua additional functions.} +\Msg{* Package: lualibs 2019-02-14 v2.64 Lua additional functions.} \Msg{************************************************************************} \keepsilent @@ -107,7 +107,7 @@ and lualibs-extended.lua. %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{lualibs.drv} - [2010/01/28 v2.63 Lua Libraries.] + [2019/02/14 v2.64 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{2019/01/28 v2.63} +% \date{2019/02/14 v2.64} % \author{Élie Roux · \email{elie.roux@telecom-bretagne.eu}\\ % Philipp Gesang · \email{phg@phi-gamma.net}\\ % Ulrike Fischer · \email{fischer@troubleshooting-tex.de}\\ @@ -429,8 +429,8 @@ lualibs = lualibs or { } lualibs.module_info = { name = "lualibs", - version = 2.63, - date = "2019-01-28", + version = 2.64, + date = "2019-02-14", description = "ConTeXt Lua standard libraries.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", @@ -584,8 +584,8 @@ local loadmodule = lualibs.loadmodule local lualibs_basic_module = { name = "lualibs-basic", - version = 2.63, - date = "2019-01-28", + version = 2.64, + date = "2019-02-14", description = "ConTeXt Lua libraries -- basic collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", @@ -666,8 +666,8 @@ lualibs = lualibs or { } local lualibs_extended_module = { name = "lualibs-extended", - version = 2.63, - date = "2019-01-28", + version = 2.64, + date = "2019-02-14", description = "ConTeXt Lua libraries -- extended collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua index 3ae4cba02fd..2c5215eb362 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic-merged.lua @@ -1,6 +1,6 @@ -- merged file : lualibs-basic-merged.lua -- parent file : lualibs-basic.lua --- merge date : Wed Jan 30 23:25:49 2019 +-- merge date : Fri Feb 22 23:27:00 2019 do -- begin closure to overcome local limits and interference diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua index 87b793b9b4e..19cbe26bf2d 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-basic.lua @@ -29,8 +29,8 @@ local loadmodule = lualibs.loadmodule local lualibs_basic_module = { name = "lualibs-basic", - version = 2.63, - date = "2019-01-28", + version = 2.64, + date = "2019-02-14", description = "ConTeXt Lua libraries -- basic collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua index d9b3cc8a212..229a713c401 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua @@ -1,6 +1,6 @@ -- merged file : lualibs-extended-merged.lua -- parent file : lualibs-extended.lua --- merge date : Wed Jan 30 23:25:40 2019 +-- merge date : Fri Feb 22 23:26:50 2019 do -- begin closure to overcome local limits and interference @@ -359,6 +359,7 @@ local environment={ formattedfloat=number.formattedfloat, stripzero=lpeg.patterns.stripzero, stripzeros=lpeg.patterns.stripzeros, + FORMAT=string.f9, } local arguments={ "a1" } setmetatable(arguments,{ __index=function(t,k) diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua index 0bf956ec536..4d9e29591ed 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended.lua @@ -30,8 +30,8 @@ lualibs = lualibs or { } local lualibs_extended_module = { name = "lualibs-extended", - version = 2.63, - date = "2019-01-28", + version = 2.64, + date = "2019-02-14", description = "ConTeXt Lua libraries -- extended collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-unicode.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-unicode.lua index 73d1eb7660c..b03b49f0048 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-unicode.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-unicode.lua @@ -31,7 +31,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/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-sta.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-sta.lua index d140cacdcd8..7819395f69c 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-sta.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-sta.lua @@ -289,24 +289,24 @@ end -- -- local concat = table.concat -- --- local pdfpageliteral = nodes.pool.pdfpageliteral +-- local pageliteral = nodes.pool.pageliteral -- -- function demostacker.start(s,t,first,last) -- local n = whatever[t[last]] -- -- s.report("start: %s",n) --- return pdfpageliteral(n) +-- return pageliteral(n) -- end -- -- function demostacker.stop(s,t,first,last) -- local n = whatever[false] -- -- s.report("stop: %s",n) --- return pdfpageliteral(n) +-- return pageliteral(n) -- end -- -- function demostacker.change(s,t1,first1,last1,t2,first2,last2) -- local n = whatever[t2[last2]] -- -- s.report("change: %s",n) --- return pdfpageliteral(n) +-- return pageliteral(n) -- end -- -- demostacker.mode = "switch" @@ -325,7 +325,7 @@ end -- r[#r+1] = whatever[t[i]] -- end -- -- s.report("start: %s",concat(r," ")) --- return pdfpageliteral(concat(r," ")) +-- return pageliteral(concat(r," ")) -- end -- -- function demostacker.stop(s,t,first,last) @@ -334,7 +334,7 @@ end -- r[#r+1] = whatever[false] -- end -- -- s.report("stop: %s",concat(r," ")) --- return pdfpageliteral(concat(r," ")) +-- return pageliteral(concat(r," ")) -- end -- -- function demostacker.change(s,t1,first1,last1,t2,first2,last2) @@ -346,7 +346,7 @@ end -- r[#r+1] = whatever[t2[i]] -- end -- -- s.report("change: %s",concat(r," ")) --- return pdfpageliteral(concat(r," ")) +-- return pageliteral(concat(r," ")) -- end -- -- demostacker.mode = "stack" diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-str.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-str.lua index 410a4a547e4..713c294ebe7 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-str.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs-util-str.lua @@ -612,6 +612,8 @@ local environment = { formattedfloat = number.formattedfloat, stripzero = lpeg.patterns.stripzero, stripzeros = lpeg.patterns.stripzeros, + + FORMAT = string.f9, } -- -- -- @@ -730,6 +732,17 @@ local format_F = function(f) -- beware, no cast to number end end +-- if string.f9 then +-- format_F = function(f) -- beware, no cast to number +-- n = n + 1 +-- if not f or f == "" then +-- return format("(((a%s > -0.0000000005 and a%s < 0.0000000005) and '0') or FORMAT(a%s))",n,n,n,n,n) +-- else +-- return format("((a%s %% 1 == 0) and format('%%i',a%s) or FORMAT(a%s,'%%%sf'))",n,n,n,f) +-- end +-- end +-- end + local format_k = function(b,a) -- slow n = n + 1 return format("formattedfloat(a%s,%i,%i)",n,b or 0, a or 0) diff --git a/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua b/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua index 6ed21b7f404..92a9168d4ee 100644 --- a/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua +++ b/Master/texmf-dist/tex/luatex/lualibs/lualibs.lua @@ -25,8 +25,8 @@ lualibs = lualibs or { } lualibs.module_info = { name = "lualibs", - version = 2.63, - date = "2019-01-28", + version = 2.64, + date = "2019-02-14", description = "ConTeXt Lua standard libraries.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", -- cgit v1.2.3