From dd06d4496374d098aa8082c27f4ebfe8ab0bdab1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Oct 2019 21:51:29 +0000 Subject: l3kernel (22oct19) git-svn-id: svn://tug.org/texlive/trunk@52510 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 68 +++++++++++++++++----- .../tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.lua | 14 +++++ Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- 5 files changed, 71 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3kernel') diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 81fdc1aa525..beba4ee3583 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -65,7 +65,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -733,6 +733,7 @@ \__kernel_primitive:NN \pdflastximagepages \tex_pdflastximagepages:D \__kernel_primitive:NN \pdflinkmargin \tex_pdflinkmargin:D \__kernel_primitive:NN \pdfliteral \tex_pdfliteral:D + \__kernel_primitive:NN \pdfmajorversion \tex_pdfmajorversion:D \__kernel_primitive:NN \pdfminorversion \tex_pdfminorversion:D \__kernel_primitive:NN \pdfnames \tex_pdfnames:D \__kernel_primitive:NN \pdfobj \tex_pdfobj:D @@ -1220,16 +1221,17 @@ \__kernel_primitive:NN \Usuperscript \tex_Usuperscript:D \__kernel_primitive:NN \Uunderdelimiter \tex_Uunderdelimiter:D \__kernel_primitive:NN \Uvextensible \tex_Uvextensible:D - \__kernel_primitive:NN \harftexrevision \tex_harftexrevision:D - \__kernel_primitive:NN \harftexversion \tex_harftexversion:D \__kernel_primitive:NN \autospacing \tex_autospacing:D \__kernel_primitive:NN \autoxspacing \tex_autoxspacing:D + \__kernel_primitive:NN \disinhibitglue \tex_disinhibitglue:D \__kernel_primitive:NN \dtou \tex_dtou:D \__kernel_primitive:NN \epTeXinputencoding \tex_epTeXinputencoding:D \__kernel_primitive:NN \epTeXversion \tex_epTeXversion:D \__kernel_primitive:NN \euc \tex_euc:D + \__kernel_primitive:NN \hfi \tex_hfi:D \__kernel_primitive:NN \ifdbox \tex_ifdbox:D \__kernel_primitive:NN \ifddir \tex_ifddir:D + \__kernel_primitive:NN \ifmbox \tex_ifmbox:D \__kernel_primitive:NN \ifmdir \tex_ifmdir:D \__kernel_primitive:NN \iftbox \tex_iftbox:D \__kernel_primitive:NN \iftdir \tex_iftdir:D @@ -1246,22 +1248,33 @@ \__kernel_primitive:NN \kansujichar \tex_kansujichar:D \__kernel_primitive:NN \kcatcode \tex_kcatcode:D \__kernel_primitive:NN \kuten \tex_kuten:D + \__kernel_primitive:NN \lastnodechar \tex_lastnodechar:D + \__kernel_primitive:NN \lastnodesubtype \tex_lastnodesubtype:D \__kernel_primitive:NN \noautospacing \tex_noautospacing:D \__kernel_primitive:NN \noautoxspacing \tex_noautoxspacing:D + \__kernel_primitive:NN \pagefistretch \tex_pagefistretch:D \__kernel_primitive:NN \postbreakpenalty \tex_postbreakpenalty:D \__kernel_primitive:NN \prebreakpenalty \tex_prebreakpenalty:D \__kernel_primitive:NN \ptexminorversion \tex_ptexminorversion:D \__kernel_primitive:NN \ptexrevision \tex_ptexrevision:D \__kernel_primitive:NN \ptexversion \tex_ptexversion:D + \__kernel_primitive:NN \readpapersizespecial \tex_readpapersizespecial:D + \__kernel_primitive:NN \scriptbaselineshiftfactor + \tex_scriptbaselineshiftfactor:D + \__kernel_primitive:NN \scriptscriptbaselineshiftfactor + \tex_scriptscriptbaselineshiftfactor:D \__kernel_primitive:NN \showmode \tex_showmode:D \__kernel_primitive:NN \sjis \tex_sjis:D \__kernel_primitive:NN \tate \tex_tate:D \__kernel_primitive:NN \tbaselineshift \tex_tbaselineshift:D + \__kernel_primitive:NN \textbaselineshiftfactor + \tex_textbaselineshiftfactor:D \__kernel_primitive:NN \tfont \tex_tfont:D \__kernel_primitive:NN \xkanjiskip \tex_xkanjiskip:D \__kernel_primitive:NN \xspcode \tex_xspcode:D \__kernel_primitive:NN \ybaselineshift \tex_ybaselineshift:D \__kernel_primitive:NN \yoko \tex_yoko:D + \__kernel_primitive:NN \vfi \tex_vfi:D \__kernel_primitive:NN \disablecjktoken \tex_disablecjktoken:D \__kernel_primitive:NN \enablecjktoken \tex_enablecjktoken:D \__kernel_primitive:NN \forcecjktoken \tex_forcecjktoken:D @@ -1271,6 +1284,13 @@ \__kernel_primitive:NN \ucs \tex_ucs:D \__kernel_primitive:NN \uptexrevision \tex_uptexrevision:D \__kernel_primitive:NN \uptexversion \tex_uptexversion:D + \__kernel_primitive:NN \odelcode \tex_odelcode:D + \__kernel_primitive:NN \odelimiter \tex_odelimiter:D + \__kernel_primitive:NN \omathaccent \tex_omathaccent:D + \__kernel_primitive:NN \omathchar \tex_omathchar:D + \__kernel_primitive:NN \omathchardef \tex_omathchardef:D + \__kernel_primitive:NN \omathcode \tex_omathcode:D + \__kernel_primitive:NN \oradical \tex_oradical:D \tex_endgroup:D \tex_ifdefined:D \@@end \tex_let:D \tex_end:D \@@end @@ -2129,7 +2149,11 @@ \tex_ifdefined:D \tex_luatexversion:D \tex_chardef:D \c_max_register_int = 65 535 ~ \tex_else:D - \tex_mathchardef:D \c_max_register_int = 32 767 ~ + \tex_ifdefined:D \tex_omathchardef:D + \tex_omathchardef:D \c_max_register_int = 65535 ~ + \tex_else:D + \tex_mathchardef:D \c_max_register_int = 32767 ~ + \tex_fi:D \tex_fi:D \tex_let:D \cs_set_nopar:Npn \tex_def:D \tex_let:D \cs_set_nopar:Npx \tex_edef:D @@ -6395,12 +6419,11 @@ } \cs_generate_variant:Nn \int_const:Nn { c } \if_int_odd:w 0 - \cs_if_exist:NT \tex_luatexversion:D { 1 } - \cs_if_exist:NT \tex_disablecjktoken:D - { \if_int_compare:w \tex_jis:D "2121 = "3000 ~ 1 \fi: } - \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ - \cs_if_exist:NTF \tex_disablecjktoken:D - { \cs_new_eq:NN \__int_constdef:Nw \tex_kchardef:D } + \cs_if_exist:NT \tex_luatexversion:D { 1 } + \cs_if_exist:NT \tex_omathchardef:D { 1 } + \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ + \cs_if_exist:NTF \tex_omathchardef:D + { \cs_new_eq:NN \__int_constdef:Nw \tex_omathchardef:D } { \cs_new_eq:NN \__int_constdef:Nw \tex_chardef:D } \__int_constdef:Nw \c__int_max_constdef_int 1114111 ~ \else: @@ -7587,7 +7610,7 @@ \cs_new_protected:Npn \sys_shell_now:n #1 { \lua_now:e - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { @@ -7600,7 +7623,7 @@ \cs_new_protected:Npn \sys_shell_shipout:n #1 { \lua_shipout_e:n - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { @@ -10983,8 +11006,11 @@ \seq_new:N \l__file_tmp_seq \cs_new:Npn \__kernel_file_name_sanitize:n #1 { - \__kernel_file_name_expand_loop:w #1 - \q_recursion_tail \q_recursion_stop + \exp_args:Ne \__kernel_file_name_trim_spaces:n + { + \__kernel_file_name_expand_loop:w #1 + \q_recursion_tail \q_recursion_stop + } } \cs_new:Npn \__kernel_file_name_expand_loop:w #1 \q_recursion_stop { @@ -11032,6 +11058,20 @@ \c_space_tl \exp_not:N \__kernel_file_name_expand_loop:w } +\cs_new:Npn \__kernel_file_name_trim_spaces:n #1 + { \__kernel_file_name_trim_spaces:nw {#1} #1 . \q_nil . \q_stop } +\cs_new:Npn \__kernel_file_name_trim_spaces:nw #1#2 . #3 . #4 \q_stop + { + \quark_if_nil:nTF {#3} + { + \exp_args:Ne \__kernel_file_name_trim_spaces_aux:n + { \tl_trim_spaces:n { #1 \s_stop } } + } + { \tl_trim_spaces:n {#1} } + } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:n #1 + { \__kernel_file_name_trim_spaces_aux:w #1 } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:w #1 \s_stop {#1} \cs_new:Npn \__kernel_file_name_quote:n #1 { \__kernel_file_name_quote_auxi:nnnw {#1} { 0 } { } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 35ed78283cf..258765ae5fb 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 -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \def\tempa{LaTeX2e}% diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index bb613fa4f80..50a4d8b52b8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \let\ExplLoaderFileDate\ExplFileDate \everyjob\expandafter{\the\everyjob \message{expl3 <\ExplFileDate> L3 programming layer}% diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua index 835051a40fe..eeafb132f55 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua @@ -28,6 +28,7 @@ local md5 = md5 local os = os local string = string local tex = tex +local texio = texio local unicode = unicode local abs = math.abs local byte = string.byte @@ -39,10 +40,12 @@ local md5_sum = md5.sum local open = io.open local os_clock = os.clock local os_date = os.date +local os_exec = os.execute local setcatcode = tex.setcatcode local sprint = tex.sprint local cprint = tex.cprint local write = tex.write +local write_nl = texio.write_nl local utf8_char = (utf and utf.char) or unicode.utf8.char local kpse_find = (resolvers and resolvers.findfile) or kpse.find_file local function escapehex(str) @@ -144,3 +147,14 @@ local function strcmp(A, B) end end l3kernel.strcmp = strcmp +local function shellescape(cmd) + local status,msg = os_exec(cmd) + if status == nil then + write_nl("log","runsystem(" .. cmd .. ")...(" .. msg .. ")\n") + elseif status == 0 then + write_nl("log","runsystem(" .. cmd .. ")...executed\n") + else + write_nl("log","runsystem(" .. cmd .. ")...failed " .. (msg or "") .. "\n") + end +end +l3kernel.shellescape = shellescape diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index 8794caa1df6..bf0dac992fd 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 -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% -- cgit v1.2.3