summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-21 20:36:09 +0000
committerKarl Berry <karl@freefriends.org>2018-10-21 20:36:09 +0000
commit854fa35fc4ede90cf35dae564298a94f8f99d8a4 (patch)
tree4dbdf28a055137517317eb5a3931e97cd6b106dd /Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua
parent49f149797d49ec0df2d6b2de44970a9e8560ac21 (diff)
lualibs (21oct18)
git-svn-id: svn://tug.org/texlive/trunk@48965 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/lualibs/lualibs-extended-merged.lua8
1 files changed, 6 insertions, 2 deletions
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 0175b8d8747..c2a5fc242af 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 : Fri Sep 21 15:12:38 2018
+-- merge date : Thu Oct 18 23:57:30 2018
do -- begin closure to overcome local limits and interference
@@ -2859,9 +2859,13 @@ local function resettiming(instance)
end
local ticks=clock
local seconds=function(n) return n or 0 end
-local function starttiming(instance)
+local function starttiming(instance,reset)
local timer=timers[instance or "notimer"]
local it=timer.timing
+ if reset then
+ it=0
+ timer.loadtime=0
+ end
if it==0 then
timer.starttime=ticks()
if not timer.loadtime then