summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-26 20:51:49 +0000
committerKarl Berry <karl@freefriends.org>2018-10-26 20:51:49 +0000
commitf19fcbb4940b9c3173f5b3528723e1b4291c55db (patch)
tree63162bd1132dcba4e26f5a5d74fe9085a9827711 /Master/texmf-dist/tex/latex/l3kernel
parent2415f1f4bd02c45f670cecdbcfbbe7cb2b1ef488 (diff)
l3 (26oct18)
git-svn-id: svn://tug.org/texlive/trunk@48997 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex12
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.lua14
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def2
9 files changed, 32 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 4e6662a5f8c..cb01bd88271 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -63,7 +63,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx Copyright (C) 1990-2018 The LaTeX3 Project
-\def\ExplFileDate{2018-10-19}%
+\def\ExplFileDate{2018-10-26}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -836,6 +836,7 @@
\__kernel_primitive:NN \pdfdraftmode \tex_draftmode:D
\__kernel_primitive:NN \pdfeachlinedepth \tex_eachlinedepth:D
\__kernel_primitive:NN \pdfeachlineheight \tex_eachlineheight:D
+ \__kernel_primitive:NN \pdfelapsedtime \tex_elapsedtime:D
\__kernel_primitive:NN \pdffilemoddate \tex_filemoddate:D
\__kernel_primitive:NN \pdffilesize \tex_filesize:D
\__kernel_primitive:NN \pdffirstlineheight \tex_firstlineheight:D
@@ -859,6 +860,7 @@
\__kernel_primitive:NN \pdfprotrudechars \tex_protrudechars:D
\__kernel_primitive:NN \pdfpxdimen \tex_pxdimen:D
\__kernel_primitive:NN \pdfrandomseed \tex_randomseed:D
+ \__kernel_primitive:NN \pdfresettimer \tex_resettimer:D
\__kernel_primitive:NN \pdfsavepos \tex_savepos:D
\__kernel_primitive:NN \pdfstrcmp \tex_strcmp:D
\__kernel_primitive:NN \pdfsetrandomseed \tex_setrandomseed:D
@@ -947,9 +949,11 @@
\__kernel_primitive:NN \XeTeXvariationmin \tex_XeTeXvariationmin:D
\__kernel_primitive:NN \XeTeXvariationname \tex_XeTeXvariationname:D
\__kernel_primitive:NN \XeTeXversion \tex_XeTeXversion:D
+ \__kernel_primitive:NN \elapsedtime \tex_elapsedtime:D
\__kernel_primitive:NN \mdfivesum \tex_mdfivesum:D
\__kernel_primitive:NN \ifprimitive \tex_ifprimitive:D
\__kernel_primitive:NN \primitive \tex_primitive:D
+ \__kernel_primitive:NN \resettimer \tex_resettimer:D
\__kernel_primitive:NN \shellescape \tex_shellescape:D
\__kernel_primitive:NN \alignmark \tex_alignmark:D
\__kernel_primitive:NN \aligntab \tex_aligntab:D
@@ -10568,6 +10572,12 @@
\tl_set:Nx \l__iow_newline_tl { \tl_to_str:N \l__iow_newline_tl }
\int_set:Nn \l__iow_line_target_int
{ \l_iow_line_count_int - \str_count:N \l__iow_newline_tl + 1 }
+ \int_compare:nNnT { \l__iow_line_target_int } < 0
+ {
+ \tl_set:Nn \l__iow_newline_tl { \iow_newline: }
+ \int_set:Nn \l__iow_line_target_int
+ { \l_iow_line_count_int + 1 }
+ }
\__iow_wrap_do:
\exp_args:NNf \group_end:
#4 { \tl_to_str:N \l__iow_wrap_tl }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index b7b8cc854a9..2121732fb75 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx Copyright (C) 1990-2018 The LaTeX3 Project
-\def\ExplFileDate{2018-10-19}%
+\def\ExplFileDate{2018-10-26}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\def\tempa{LaTeX2e}%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
index 279f3c276ad..640889bf12a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
@@ -38,6 +38,7 @@ local kpse_find = kpse.find_file
local lfs_attr = lfs.attributes
local md5_sum = md5.sum
local open = io.open
+local os_clock = os.clock
local os_date = os.date
local setcatcode = tex.setcatcode
local str_format = string.format
@@ -54,6 +55,19 @@ local function charcat(charcode, catcode)
sprint(charcat_table, utf8_char(charcode))
end
l3kernel.charcat = charcat
+local base_time = 0
+local function elapsedtime()
+ local val = (os_clock() - base_time) * 65536 + 0.5
+ if val > 2147483647 then
+ val = 2147483647
+ end
+ write(format("%d",val))
+end
+l3kernel.elapsedtime = elapsedtime
+local function resettimer()
+ base_time = 0
+end
+l3kernel.resettimer = resettimer
local function filemdfivesum(name)
local file = kpse_find(name, "tex", true)
if file then
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 81b874b883d..d1675372af1 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx Copyright (C) 1990-2018 The LaTeX3 Project
-\def\ExplFileDate{2018-10-19}%
+\def\ExplFileDate{2018-10-26}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
index bd2206bb9b9..67e35f6f09b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def
@@ -20,7 +20,7 @@
%%
%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project
\ProvidesExplFile
- {l3dvidpfmx.def}{2018-10-19}{}
+ {l3dvidpfmx.def}{2018-10-26}{}
{L3 Experimental driver: dvipdfmx}
\cs_new_eq:NN \__driver_literal:e \tex_special:D
\cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
index a6b17ee604b..7947cf5f5c2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def
@@ -20,7 +20,7 @@
%%
%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project
\ProvidesExplFile
- {l3dvips.def}{2018-10-19}{}
+ {l3dvips.def}{2018-10-26}{}
{L3 Experimental driver: dvips}
\cs_new_eq:NN \__driver_literal:e \tex_special:D
\cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
index 60613eafbb5..c4d86ecc97a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def
@@ -20,7 +20,7 @@
%%
%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project
\ProvidesExplFile
- {l3dvisvgm.def}{2018-10-19}{}
+ {l3dvisvgm.def}{2018-10-26}{}
{L3 Experimental driver: dvisvgm}
\cs_new_eq:NN \__driver_literal:e \tex_special:D
\cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
index 67b0dae7db4..b797fbf8230 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def
@@ -20,7 +20,7 @@
%%
%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project
\ProvidesExplFile
- {l3pdfmode.def}{2018-10-19}{}
+ {l3pdfmode.def}{2018-10-26}{}
{L3 Experimental driver: PDF mode}
\cs_new_eq:NN \__driver_literal:e \tex_special:D
\cs_new_protected:Npn \__driver_literal:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
index ab918b7aaf6..718a499bb9d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
@@ -20,7 +20,7 @@
%%
%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project
\ProvidesExplFile
- {l3xdvidpfmx.def}{2018-10-19}{}
+ {l3xdvidpfmx.def}{2018-10-26}{}
{L3 Experimental driver: xdvipdfmx}
\cs_new_eq:NN \__driver_literal:e \tex_special:D
\cs_new_protected:Npn \__driver_literal:n #1