texlive[52524] Master/texmf-dist: l3kernel (24oct19)
commits+karl at tug.org
commits+karl at tug.org
Thu Oct 24 23:48:00 CEST 2019
Revision: 52524
http://tug.org/svn/texlive?view=revision&revision=52524
Author: karl
Date: 2019-10-24 23:48:00 +0200 (Thu, 24 Oct 2019)
Log Message:
-----------
l3kernel (24oct19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/l3kernel/README.md
trunk/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex
trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md 2019-10-24 21:48:00 UTC (rev 52524)
@@ -7,6 +7,17 @@
## [Unreleased]
+## [2019-10-24]
+
+### Changed
+
+- File names are now returned without quotes by `\file_full_name:n`
+
+### Fixed
+
+- `\file_if_exist:n(TF)`, etc., when dealing with file names containing
+ spaces (see #642)
+
## [2019-10-21]
### Added
@@ -578,7 +589,8 @@
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2019-10-21...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2019-10-24...HEAD
+[2019-10-24]: https://github.com/latex3/latex3/compare/2019-10-21...2019-10-24
[2019-10-21]: https://github.com/latex3/latex3/compare/2019-10-14...2019-10-21
[2019-10-14]: https://github.com/latex3/latex3/compare/2019-10-11...2019-10-14
[2019-10-11]: https://github.com/latex3/latex3/compare/2019-10-02...2019-10-11
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/README.md 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/README.md 2019-10-24 21:48:00 UTC (rev 52524)
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2019-10-21
+Release 2019-10-24
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex 2019-10-24 21:48:00 UTC (rev 52524)
@@ -54,7 +54,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-10-21}
+\date{Released 2019-10-24}
\pagenumbering{roman}
\maketitle
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex 2019-10-24 21:48:00 UTC (rev 52524)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-10-21}
+\date{Released 2019-10-24}
\begin{document}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex 2019-10-24 21:48:00 UTC (rev 52524)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-10-21}
+\date{Released 2019-10-24}
\newcommand{\TF}{\textit{(TF)}}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex 2019-10-24 21:48:00 UTC (rev 52524)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-10-21}
+\date{Released 2019-10-24}
\newcommand{\TF}{\textit{(TF)}}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex 2019-10-24 21:48:00 UTC (rev 52524)
@@ -53,7 +53,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2019-10-21}
+\date{Released 2019-10-24}
\pagenumbering{roman}
\maketitle
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -24,7 +24,7 @@
%
%<*driver|generic|package|2ekernel>
%</driver|generic|package|2ekernel>
-\def\ExplFileDate{2019-10-21}%
+\def\ExplFileDate{2019-10-24}%
%<*driver>
\documentclass[full]{l3doc}
\usepackage{graphicx}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -79,7 +79,7 @@
%
% \title{The \cls{l3doc} class}
% \author{\Team}
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
% \maketitle
% \tableofcontents
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
@@ -65,9 +65,9 @@
% may contain both literal items and expandable content, which should on
% full expansion be the desired file name. Active characters (as
% declared in \cs{l_char_active_seq}) are \emph{not} expanded,
-% allowing the direct use of these in file names. File names are quoted
-% using |"| tokens if they contain spaces: as a result, |"| tokens are
-% \emph{not} permitted in file names.
+% allowing the direct use of these in file names. Quote tokens (|"|) are
+% not permitted in file names as they are reserved for internal use by some
+% \TeX{} primitives.
%
% Spaces are trimmed at the beginning and end of the file name:
% this reflects the fact that some file systems do not allow or interact
@@ -1059,7 +1059,7 @@
\tex_openin:D #1
\sys_if_engine_luatex:TF
{ {#2} }
- { #2 \scan_stop: }
+ { \exp_not:N \__kernel_file_name_quote:n {#2} \scan_stop: }
}
% \end{macrocode}
% \end{macro}
@@ -1436,10 +1436,7 @@
\cs_new_protected:Npn \iow_open:Nn #1#2
{
\tl_set:Nx \l_@@_file_name_tl
- {
- \__kernel_file_name_quote:e
- { \__kernel_file_name_sanitize:n {#2} }
- }
+ { \__kernel_file_name_sanitize:n {#2} }
\iow_close:N #1
\seq_gpop:NNTF \g_@@_streams_seq \l_@@_stream_tl
{ \@@_open_stream:NV #1 \l_@@_file_name_tl }
@@ -1459,7 +1456,8 @@
{
\tex_global:D \tex_chardef:D #1 = \l_@@_stream_tl \scan_stop:
\prop_gput:NVn \g_@@_streams_prop #1 {#2}
- \tex_immediate:D \tex_openout:D #1 #2 \scan_stop:
+ \tex_immediate:D \tex_openout:D
+ #1 \__kernel_file_name_quote:n {#2} \scan_stop:
}
\cs_generate_variant:Nn \@@_open_stream:Nn { NV }
% \end{macrocode}
@@ -2362,15 +2360,18 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}[rEXP]{\__kernel_file_name_sanitize:n}
-% \begin{macro}[rEXP]{\__kernel_file_name_expand_loop:w}
-% \begin{macro}[rEXP]{\__kernel_file_name_expand_N_type:Nw}
-% \begin{macro}[rEXP]{\__kernel_file_name_expand_group:nw}
-% \begin{macro}[rEXP]{\__kernel_file_name_expand_space:w}
-% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces:n}
-% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces:nw}
-% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces_aux:n}
-% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces_aux:w}
+% \begin{macro}[EXP]{\__kernel_file_name_sanitize:n}
+% \begin{macro}[EXP]{\__kernel_file_name_expand_loop:w}
+% \begin{macro}[EXP]{\__kernel_file_name_expand_N_type:Nw}
+% \begin{macro}[EXP]{\__kernel_file_name_expand_group:nw}
+% \begin{macro}[EXP]{\__kernel_file_name_expand_space:w}
+% \begin{macro}[EXP]{\__kernel_file_name_strip_quotes:n}
+% \begin{macro}[EXP]{\__kernel_file_name_strip_quotes:nnnw}
+% \begin{macro}[EXP]{\__kernel_file_name_strip_quotes:nnn}
+% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces:n}
+% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces:nw}
+% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces_aux:n}
+% \begin{macro}[EXP]{\__kernel_file_name_trim_spaces_aux:w}
% Expanding the file name without expanding active characters is done
% using the same token-by-token approach as for example case changing.
% The finale outcome only need be \texttt{e}-type expandable, so there
@@ -2380,8 +2381,11 @@
{
\exp_args:Ne \__kernel_file_name_trim_spaces:n
{
- \__kernel_file_name_expand_loop:w #1
- \q_recursion_tail \q_recursion_stop
+ \exp_args:Ne \__kernel_file_name_strip_quotes: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
@@ -2431,6 +2435,30 @@
\exp_not:N \__kernel_file_name_expand_loop:w
}
% \end{macrocode}
+% Quoting file name uses basically the same approach as for
+% \texttt{luaquotejobname}: count the |"| tokens and remove them.
+% \begin{macrocode}
+\cs_new:Npn \__kernel_file_name_strip_quotes:n #1
+ {
+ \__kernel_file_name_strip_quotes:nnnw {#1} { 0 } { }
+ #1 " \q_recursion_tail " \q_recursion_stop
+ }
+\cs_new:Npn \__kernel_file_name_strip_quotes:nnnw #1#2#3#4 "
+ {
+ \quark_if_recursion_tail_stop_do:nn {#4}
+ { \__kernel_file_name_strip_quotes:nnn {#1} {#2} {#3} }
+ \__kernel_file_name_strip_quotes:nnnw {#1} { #2 + 1 } { #3#4 }
+ }
+\cs_new:Npn \__kernel_file_name_strip_quotes:nnn #1#2#3
+ {
+ \int_if_even:nT {#2}
+ {
+ \__kernel_msg_expandable_error:nnn
+ { kernel } { unbalanced-quote-in-filename } {#1}
+ }
+ #3
+ }
+% \end{macrocode}
% Spaces need to be trimmed from the start of the name and from the end of
% any extension. However, the name we are passed might not have an extension:
% that means we have to look for one. If there is no extension, we still use
@@ -2461,38 +2489,17 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
-% \begin{macro}[rEXP]{\__kernel_file_name_quote:n, \__kernel_file_name_quote:e}
-% \begin{macro}[rEXP]{\__kernel_file_name_quote_auxi:nnnw}
-% \begin{macro}[rEXP]{\__kernel_file_name_quote_auxii:nnn}
-% \begin{macro}[rEXP]{\__kernel_file_name_quote_auxiii:nw}
-% Quoting file name uses basically the same approach as for
-% \texttt{luaquotejobname}: count the |"| tokens, remove them then
-% re-add at the extremities.
+% \begin{macro}[EXP]{\__kernel_file_name_quote:n}
+% \begin{macro}[EXP]{\__kernel_file_name_quote:nw}
% \begin{macrocode}
\cs_new:Npn \__kernel_file_name_quote:n #1
+ { \__kernel_file_name_quote:nw {#1} #1 ~ \q_nil \q_stop }
+\cs_new:Npn \__kernel_file_name_quote:nw #1 #2 ~ #3 \q_stop
{
- \__kernel_file_name_quote_auxi:nnnw {#1} { 0 } { }
- #1 " \q_recursion_tail " \q_recursion_stop
- }
-\cs_generate_variant:Nn \__kernel_file_name_quote:n { e }
-\cs_new:Npn \__kernel_file_name_quote_auxi:nnnw #1#2#3#4 "
- {
- \quark_if_recursion_tail_stop_do:nn {#4}
- { \__kernel_file_name_quote_auxii:nnn {#1} {#2} {#3} }
- \__kernel_file_name_quote_auxi:nnnw {#1} { #2 + 1 } { #3#4 }
- }
-\cs_new:Npn \__kernel_file_name_quote_auxii:nnn #1#2#3
- {
- \int_if_even:nT {#2}
- {
- \__kernel_msg_expandable_error:nnn
- { kernel } { unbalanced-quote-in-filename } {#1}
- }
- \__kernel_file_name_quote_auxiii:nw {#3} #3 ~ \q_nil \q_stop
- }
-\cs_new:Npn \__kernel_file_name_quote_auxiii:nw #1 #2 ~ #3 \q_stop
- {
\quark_if_nil:nTF {#3}
{ #1 }
{ "#1" }
@@ -2500,8 +2507,6 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \begin{variable}{\c_@@_marker_tl}
% The same idea as the marker for rescanning token lists: this pair of
@@ -2537,18 +2542,22 @@
}
{ \prg_return_false: }
}
-\cs_new_protected:Npn \@@_get_aux:nnN #1#2#3
+\cs_new_protected:Npx \@@_get_aux:nnN #1#2#3
{
- \if_false: { \fi:
+ \exp_not:N \if_false: { \exp_not:N \fi:
\group_begin:
\int_set_eq:NN \tex_tracingnesting:D \c_zero_int
- \exp_args:No \tex_everyeof:D { \c_@@_marker_tl }
+ \exp_not:N \exp_args:No \tex_everyeof:D
+ { \exp_not:N \c_@@_marker_tl }
#2 \scan_stop:
- \exp_after:wN \@@_get_do:Nw
- \exp_after:wN #3
- \exp_after:wN \prg_do_nothing:
- \tex_input:D #1 \scan_stop:
- \if_false: } \fi:
+ \exp_not:N \exp_after:wN \exp_not:N \@@_get_do:Nw
+ \exp_not:N \exp_after:wN #3
+ \exp_not:N \exp_after:wN \exp_not:N \prg_do_nothing:
+ \exp_not:N \tex_input:D
+ \sys_if_engine_luatex:TF
+ { {#1} }
+ { \exp_not:N \__kernel_file_name_quote:n {#1} \scan_stop: }
+ \exp_not:N \if_false: } \exp_not:N \fi:
}
\exp_args:Nno \use:nn
{ \cs_new_protected:Npn \@@_get_do:Nw #1#2 }
@@ -2561,38 +2570,31 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_file_size:n}
+% \begin{macro}{\@@_size:n}
% A copy of the primitive where it's available, or the \LuaTeX{}
% equivalent if relevant.
% \begin{macrocode}
-\cs_new_eq:NN \@@_file_size:n \tex_filesize:D
+\cs_new_eq:NN \@@_size:n \tex_filesize:D
\sys_if_engine_luatex:T
{
- \cs_gset:Npn \@@_file_size:n #1
+ \cs_gset:Npn \@@_size:n #1
{
\lua_now:e
- {
- l3kernel.filesize
- ( " \lua_escape:e {#1} " )
- }
+ { l3kernel.filesize ( " \lua_escape:e {#1} " ) }
}
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[rEXP]{\file_full_name:n, \@@_full_name:n}
-% \begin{macro}[rEXP]{\@@_full_name:nn}
-% \begin{macro}[rEXP]{\@@_full_name_aux:nn}
-% \begin{macro}[rEXP]{\@@_full_name_aux:n}
-% \begin{macro}[rEXP]{\@@_file_name_cleanup:w}
-% \begin{macro}[rEXP]{\@@_file_name_end:}
-% \begin{macro}[rEXP]{\@@_file_name_ext_check:n}
-% \begin{macro}[rEXP]
-% {
-% \@@_file_name_ext_check_auxi:nw ,
-% \@@_file_name_ext_check_auxii:nw ,
-% \@@_file_name_ext_check_auxiii:nw
-% }
+% \begin{macro}[EXP]{\file_full_name:n, \@@_full_name:n}
+% \begin{macro}[EXP]{\@@_full_name_aux:nn}
+% \begin{macro}[EXP]{\@@_full_name_aux:n}
+% \begin{macro}[EXP]{\@@_name_cleanup:w}
+% \begin{macro}[EXP]{\@@_name_end:}
+% \begin{macro}[EXP]{\@@_name_ext_check:n}
+% \begin{macro}[EXP]{\@@_name_ext_check:nw}
+% \begin{macro}[EXP]{\@@_name_ext_check:nnw}
+% \begin{macro}[EXP]{\@@_name_ext_check:nn}
% File searching can be carried out if the \tn{pdffilesize} primitive
% or an equivalent is available. That of course means we need to
% arrange for everything else to here to be done by expansion too.
@@ -2604,11 +2606,6 @@
\exp_args:Ne \@@_full_name:n
{ \__kernel_file_name_sanitize:n {#1} }
}
-\cs_new:Npn \@@_full_name:n #1
- {
- \exp_args:Ne \@@_full_name:nn
- { \__kernel_file_name_quote:n {#1} } {#1}
- }
% \end{macrocode}
% First, we check of the file is just here: no mapping so we do not
% need the break part of the broader auxiliary. We are using the fact
@@ -2615,24 +2612,24 @@
% that the primitive here returns nothing if the file is entirely absent.
% For package mode, \tn{input at path} is a token list not a sequence.
% \begin{macrocode}
-\cs_new:Npn \@@_full_name:nn #1#2
+\cs_new:Npn \@@_full_name:n #1
{
\tl_if_blank:nF {#1}
{
- \tl_if_blank:eTF { \@@_file_size:n {#1} }
+ \tl_if_blank:eTF { \@@_size:n {#1} }
{
\seq_map_tokens:Nn \l_file_search_path_seq
- { \@@_full_name_aux:nn {#2} }
+ { \@@_full_name_aux:nn {#1} }
%<*package>
\cs_if_exist:NT \input at path
{
\tl_map_tokens:Nn \input at path
- { \@@_full_name_aux:nn {#2} }
+ { \@@_full_name_aux:nn {#1} }
}
%</package>
- \@@_file_name_end:
+ \@@_name_end:
}
- { \@@_file_ext_check:n {#1} }
+ { \@@_ext_check:n {#1} }
}
}
% \end{macrocode}
@@ -2640,60 +2637,52 @@
% twice in the event we find the right file.
% \begin{macrocode}
\cs_new:Npn \@@_full_name_aux:nn #1#2
- {
- \exp_args:Ne \@@_full_name_aux:n
- { \__kernel_file_name_quote:e { \tl_to_str:n {#2} / #1 } }
- }
+ { \exp_args:Ne \@@_full_name_aux:n { \tl_to_str:n {#2} / #1 } }
\cs_new:Npn \@@_full_name_aux:n #1
{
- \tl_if_blank:eF { \@@_file_size:n {#1} }
+ \tl_if_blank:eF { \@@_size:n {#1} }
{
\seq_map_break:n
{
- \@@_file_ext_check:n {#1}
- \@@_file_name_cleanup:w
+ \@@_ext_check:n {#1}
+ \@@_name_cleanup:w
}
}
}
-\cs_new:Npn \@@_file_name_cleanup:w #1 \@@_file_name_end: { }
-\cs_new:Npn \@@_file_name_end: { }
+\cs_new:Npn \@@_name_cleanup:w #1 \@@_name_end: { }
+\cs_new:Npn \@@_name_end: { }
% \end{macrocode}
% As \TeX{} automatically adds |.tex| if there is no extension,
-% there is a little clean up to do here. First, find the file
-% extension if present, ignoring any quotes and avoiding dots in
-% the path.(The quoted name is retained for the common case that
-% there is no additional work to do.)
+% there is a little clean up to do here. First, make sure we are not in the
+% directory part, saving that. Then check for an extension.
% \begin{macrocode}
-\cs_new:Npn \@@_file_ext_check:n #1
- { \@@_file_ext_check_auxi:nw {#1} #1 " #1 " \q_stop }
-\cs_new:Npn \@@_file_ext_check_auxi:nw #1#2 " #3 " #4 \q_stop
- { \@@_file_ext_check_auxii:nw {#1} #3 / \q_nil / \q_stop }
-\cs_new:Npn \@@_file_ext_check_auxii:nw #1#2 / #3 / #4 \q_stop
+\cs_new:Npn \@@_ext_check:n #1
+ { \@@_ext_check:nw { / } #1 / \q_nil / \q_stop }
+\cs_new:Npn \@@_ext_check:nw #1 #2 / #3 / #4 \q_stop
{
\quark_if_nil:nTF {#3}
- { \@@_file_ext_check_auxiii:nw {#1} #2 . \q_nil . \q_stop }
- { \@@_file_ext_check_auxii:nw {#1} #3 / #4 \q_stop }
+ {
+ \exp_args:No \@@_ext_check:nnw
+ { \use_none:n #1 } {#2} #2 . \q_nil . \q_stop
+ }
+ { \@@_ext_check:nw { #1 #2 / } #3 / #4 \q_stop }
}
-\cs_new:Npx \@@_file_ext_check_auxiii:nw #1#2 . #3 . #4 \q_stop
+\cs_new:Npx \@@_ext_check:nnw #1#2#3 . #4 . #5 \q_stop
{
- \exp_not:N \quark_if_nil:nTF {#3}
+ \exp_not:N \quark_if_nil:nTF {#4}
{
- \exp_not:N \exp_args:Nee \exp_not:N \@@_file_ext_check_auxiv:nn
- { \exp_not:N \__kernel_file_name_quote:n {#1} }
- {
- \exp_not:N \__kernel_file_name_quote:n
- { #1 \tl_to_str:n { .tex } }
- }
+ \exp_not:N \@@_ext_check:nn
+ { #1 #2 } { #1 #2 \tl_to_str:n { .tex } }
}
- {#1}
+ { #1 #2 }
}
-\cs_new:Npn \@@_file_ext_check_auxiv:nn #1#2
+\cs_new:Npn \@@_ext_check:nn #1#2
{
- \tl_if_blank:eTF { \@@_file_size:n {#2} }
+ \tl_if_blank:eTF { \@@_size:n {#2} }
{#1}
{
\int_compare:nNnTF
- { \@@_file_size:n {#1} } = { \@@_file_size:n {#2} }
+ { \@@_size:n {#1} } = { \@@_size:n {#2} }
{#2}
{#1}
}
@@ -2727,6 +2716,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\file_get_full_name:nN, \file_get_full_name:VN}
% \begin{macro}[TF]{\file_get_full_name:nN, \file_get_full_name:VN}
@@ -2806,10 +2796,7 @@
\cs_new_protected:Npn \@@_get_full_name_search:nN #1#2
{
\tl_set:Nx \l_@@_full_name_tl
- {
- \__kernel_file_name_quote:e
- { \tl_to_str:n {#1} \l_@@_base_name_tl }
- }
+ { \tl_to_str:n {#1} \l_@@_base_name_tl }
\__kernel_ior_open:No \g_@@_internal_ior \l_@@_full_name_tl
\ior_if_eof:NF \g_@@_internal_ior { #2 { \prg_break: } }
}
@@ -3092,19 +3079,22 @@
{ \@@_input:V \l_@@_full_name_tl }
{ \__kernel_file_missing:n {#1} }
}
-\cs_new_protected:Npn \@@_input:n #1
+\cs_new_protected:Npx \@@_input:n #1
{
%<*initex>
- \seq_gput_right:Nn \g_@@_record_seq {#1}
+ \seq_gput_right:Nn \exp_not:N \g_@@_record_seq {#1}
%</initex>
%<*package>
- \clist_if_exist:NTF \@filelist
- { \@addtofilelist {#1} }
- { \seq_gput_right:Nn \g_@@_record_seq {#1} }
+ \exp_not:N \clist_if_exist:NTF \exp_not:N \@filelist
+ { \exp_not:N \@addtofilelist {#1} }
+ { \seq_gput_right:Nn \exp_not:N \g_@@_record_seq {#1} }
%</package>
- \@@_input_push:n {#1}
- \tex_input:D #1 \c_space_tl
- \@@_input_pop:
+ \exp_not:N \@@_input_push:n {#1}
+ \exp_not:N \tex_input:D
+ \sys_if_engine_luatex:TF
+ { {#1} }
+ { \exp_not:N \__kernel_file_name_quote:n {#1} \scan_stop: }
+ \exp_not:N \@@_input_pop:
}
\cs_generate_variant:Nn \@@_input:n { V }
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3final.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
% \maketitle
%
% \begin{documentation}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
% \maketitle
%
% \begin{documentation}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2019-10-21}
+% \date{Released 2019-10-24}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex 2019-10-24 21:48:00 UTC (rev 52524)
@@ -65,7 +65,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-10-21}%
+\def\ExplFileDate{2019-10-24}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -10392,7 +10392,7 @@
\tex_openin:D #1
\sys_if_engine_luatex:TF
{ {#2} }
- { #2 \scan_stop: }
+ { \exp_not:N \__kernel_file_name_quote:n {#2} \scan_stop: }
}
\cs_new_protected:Npn \ior_close:N #1
{
@@ -10567,10 +10567,7 @@
\cs_new_protected:Npn \iow_open:Nn #1#2
{
\tl_set:Nx \l__iow_file_name_tl
- {
- \__kernel_file_name_quote:e
- { \__kernel_file_name_sanitize:n {#2} }
- }
+ { \__kernel_file_name_sanitize:n {#2} }
\iow_close:N #1
\seq_gpop:NNTF \g__iow_streams_seq \l__iow_stream_tl
{ \__iow_open_stream:NV #1 \l__iow_file_name_tl }
@@ -10585,7 +10582,8 @@
{
\tex_global:D \tex_chardef:D #1 = \l__iow_stream_tl \scan_stop:
\prop_gput:NVn \g__iow_streams_prop #1 {#2}
- \tex_immediate:D \tex_openout:D #1 #2 \scan_stop:
+ \tex_immediate:D \tex_openout:D
+ #1 \__kernel_file_name_quote:n {#2} \scan_stop:
}
\cs_generate_variant:Nn \__iow_open_stream:Nn { NV }
\cs_new_protected:Npn \iow_close:N #1
@@ -11008,8 +11006,11 @@
{
\exp_args:Ne \__kernel_file_name_trim_spaces:n
{
- \__kernel_file_name_expand_loop:w #1
- \q_recursion_tail \q_recursion_stop
+ \exp_args:Ne \__kernel_file_name_strip_quotes: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
@@ -11058,6 +11059,26 @@
\c_space_tl
\exp_not:N \__kernel_file_name_expand_loop:w
}
+\cs_new:Npn \__kernel_file_name_strip_quotes:n #1
+ {
+ \__kernel_file_name_strip_quotes:nnnw {#1} { 0 } { }
+ #1 " \q_recursion_tail " \q_recursion_stop
+ }
+\cs_new:Npn \__kernel_file_name_strip_quotes:nnnw #1#2#3#4 "
+ {
+ \quark_if_recursion_tail_stop_do:nn {#4}
+ { \__kernel_file_name_strip_quotes:nnn {#1} {#2} {#3} }
+ \__kernel_file_name_strip_quotes:nnnw {#1} { #2 + 1 } { #3#4 }
+ }
+\cs_new:Npn \__kernel_file_name_strip_quotes:nnn #1#2#3
+ {
+ \int_if_even:nT {#2}
+ {
+ \__kernel_msg_expandable_error:nnn
+ { kernel } { unbalanced-quote-in-filename } {#1}
+ }
+ #3
+ }
\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
@@ -11073,28 +11094,9 @@
{ \__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:nw {#1} #1 ~ \q_nil \q_stop }
+\cs_new:Npn \__kernel_file_name_quote:nw #1 #2 ~ #3 \q_stop
{
- \__kernel_file_name_quote_auxi:nnnw {#1} { 0 } { }
- #1 " \q_recursion_tail " \q_recursion_stop
- }
-\cs_generate_variant:Nn \__kernel_file_name_quote:n { e }
-\cs_new:Npn \__kernel_file_name_quote_auxi:nnnw #1#2#3#4 "
- {
- \quark_if_recursion_tail_stop_do:nn {#4}
- { \__kernel_file_name_quote_auxii:nnn {#1} {#2} {#3} }
- \__kernel_file_name_quote_auxi:nnnw {#1} { #2 + 1 } { #3#4 }
- }
-\cs_new:Npn \__kernel_file_name_quote_auxii:nnn #1#2#3
- {
- \int_if_even:nT {#2}
- {
- \__kernel_msg_expandable_error:nnn
- { kernel } { unbalanced-quote-in-filename } {#1}
- }
- \__kernel_file_name_quote_auxiii:nw {#3} #3 ~ \q_nil \q_stop
- }
-\cs_new:Npn \__kernel_file_name_quote_auxiii:nw #1 #2 ~ #3 \q_stop
- {
\quark_if_nil:nTF {#3}
{ #1 }
{ "#1" }
@@ -11116,18 +11118,22 @@
}
{ \prg_return_false: }
}
-\cs_new_protected:Npn \__file_get_aux:nnN #1#2#3
+\cs_new_protected:Npx \__file_get_aux:nnN #1#2#3
{
- \if_false: { \fi:
+ \exp_not:N \if_false: { \exp_not:N \fi:
\group_begin:
\int_set_eq:NN \tex_tracingnesting:D \c_zero_int
- \exp_args:No \tex_everyeof:D { \c__file_marker_tl }
+ \exp_not:N \exp_args:No \tex_everyeof:D
+ { \exp_not:N \c__file_marker_tl }
#2 \scan_stop:
- \exp_after:wN \__file_get_do:Nw
- \exp_after:wN #3
- \exp_after:wN \prg_do_nothing:
- \tex_input:D #1 \scan_stop:
- \if_false: } \fi:
+ \exp_not:N \exp_after:wN \exp_not:N \__file_get_do:Nw
+ \exp_not:N \exp_after:wN #3
+ \exp_not:N \exp_after:wN \exp_not:N \prg_do_nothing:
+ \exp_not:N \tex_input:D
+ \sys_if_engine_luatex:TF
+ { {#1} }
+ { \exp_not:N \__kernel_file_name_quote:n {#1} \scan_stop: }
+ \exp_not:N \if_false: } \exp_not:N \fi:
}
\exp_args:Nno \use:nn
{ \cs_new_protected:Npn \__file_get_do:Nw #1#2 }
@@ -11136,16 +11142,13 @@
\group_end:
\tl_set:No #1 {#2}
}
-\cs_new_eq:NN \__file_file_size:n \tex_filesize:D
+\cs_new_eq:NN \__file_size:n \tex_filesize:D
\sys_if_engine_luatex:T
{
- \cs_gset:Npn \__file_file_size:n #1
+ \cs_gset:Npn \__file_size:n #1
{
\lua_now:e
- {
- l3kernel.filesize
- ( " \lua_escape:e {#1} " )
- }
+ { l3kernel.filesize ( " \lua_escape:e {#1} " ) }
}
}
\cs_new:Npn \file_full_name:n #1
@@ -11155,75 +11158,64 @@
}
\cs_new:Npn \__file_full_name:n #1
{
- \exp_args:Ne \__file_full_name:nn
- { \__kernel_file_name_quote:n {#1} } {#1}
- }
-\cs_new:Npn \__file_full_name:nn #1#2
- {
\tl_if_blank:nF {#1}
{
- \tl_if_blank:eTF { \__file_file_size:n {#1} }
+ \tl_if_blank:eTF { \__file_size:n {#1} }
{
\seq_map_tokens:Nn \l_file_search_path_seq
- { \__file_full_name_aux:nn {#2} }
+ { \__file_full_name_aux:nn {#1} }
\cs_if_exist:NT \input at path
{
\tl_map_tokens:Nn \input at path
- { \__file_full_name_aux:nn {#2} }
+ { \__file_full_name_aux:nn {#1} }
}
- \__file_file_name_end:
+ \__file_name_end:
}
- { \__file_file_ext_check:n {#1} }
+ { \__file_ext_check:n {#1} }
}
}
\cs_new:Npn \__file_full_name_aux:nn #1#2
- {
- \exp_args:Ne \__file_full_name_aux:n
- { \__kernel_file_name_quote:e { \tl_to_str:n {#2} / #1 } }
- }
+ { \exp_args:Ne \__file_full_name_aux:n { \tl_to_str:n {#2} / #1 } }
\cs_new:Npn \__file_full_name_aux:n #1
{
- \tl_if_blank:eF { \__file_file_size:n {#1} }
+ \tl_if_blank:eF { \__file_size:n {#1} }
{
\seq_map_break:n
{
- \__file_file_ext_check:n {#1}
- \__file_file_name_cleanup:w
+ \__file_ext_check:n {#1}
+ \__file_name_cleanup:w
}
}
}
-\cs_new:Npn \__file_file_name_cleanup:w #1 \__file_file_name_end: { }
-\cs_new:Npn \__file_file_name_end: { }
-\cs_new:Npn \__file_file_ext_check:n #1
- { \__file_file_ext_check_auxi:nw {#1} #1 " #1 " \q_stop }
-\cs_new:Npn \__file_file_ext_check_auxi:nw #1#2 " #3 " #4 \q_stop
- { \__file_file_ext_check_auxii:nw {#1} #3 / \q_nil / \q_stop }
-\cs_new:Npn \__file_file_ext_check_auxii:nw #1#2 / #3 / #4 \q_stop
+\cs_new:Npn \__file_name_cleanup:w #1 \__file_name_end: { }
+\cs_new:Npn \__file_name_end: { }
+\cs_new:Npn \__file_ext_check:n #1
+ { \__file_ext_check:nw { / } #1 / \q_nil / \q_stop }
+\cs_new:Npn \__file_ext_check:nw #1 #2 / #3 / #4 \q_stop
{
\quark_if_nil:nTF {#3}
- { \__file_file_ext_check_auxiii:nw {#1} #2 . \q_nil . \q_stop }
- { \__file_file_ext_check_auxii:nw {#1} #3 / #4 \q_stop }
+ {
+ \exp_args:No \__file_ext_check:nnw
+ { \use_none:n #1 } {#2} #2 . \q_nil . \q_stop
+ }
+ { \__file_ext_check:nw { #1 #2 / } #3 / #4 \q_stop }
}
-\cs_new:Npx \__file_file_ext_check_auxiii:nw #1#2 . #3 . #4 \q_stop
+\cs_new:Npx \__file_ext_check:nnw #1#2#3 . #4 . #5 \q_stop
{
- \exp_not:N \quark_if_nil:nTF {#3}
+ \exp_not:N \quark_if_nil:nTF {#4}
{
- \exp_not:N \exp_args:Nee \exp_not:N \__file_file_ext_check_auxiv:nn
- { \exp_not:N \__kernel_file_name_quote:n {#1} }
- {
- \exp_not:N \__kernel_file_name_quote:n
- { #1 \tl_to_str:n { .tex } }
- }
+ \exp_not:N \__file_ext_check:nn
+ { #1 #2 } { #1 #2 \tl_to_str:n { .tex } }
}
- {#1}
+ { #1 #2 }
}
-\cs_new:Npn \__file_file_ext_check_auxiv:nn #1#2
+\cs_new:Npn \__file_ext_check:nn #1#2
{
- \tl_if_blank:eTF { \__file_file_size:n {#2} }
+ \tl_if_blank:eTF { \__file_size:n {#2} }
{#1}
{
\int_compare:nNnTF
- { \__file_file_size:n {#1} } = { \__file_file_size:n {#2} }
+ { \__file_size:n {#1} } = { \__file_size:n {#2} }
{#2}
{#1}
}
@@ -11302,10 +11294,7 @@
\cs_new_protected:Npn \__file_get_full_name_search:nN #1#2
{
\tl_set:Nx \l__file_full_name_tl
- {
- \__kernel_file_name_quote:e
- { \tl_to_str:n {#1} \l__file_base_name_tl }
- }
+ { \tl_to_str:n {#1} \l__file_base_name_tl }
\__kernel_ior_open:No \g__file_internal_ior \l__file_full_name_tl
\ior_if_eof:NF \g__file_internal_ior { #2 { \prg_break: } }
}
@@ -11493,14 +11482,17 @@
{ \__file_input:V \l__file_full_name_tl }
{ \__kernel_file_missing:n {#1} }
}
-\cs_new_protected:Npn \__file_input:n #1
+\cs_new_protected:Npx \__file_input:n #1
{
- \clist_if_exist:NTF \@filelist
- { \@addtofilelist {#1} }
- { \seq_gput_right:Nn \g__file_record_seq {#1} }
- \__file_input_push:n {#1}
- \tex_input:D #1 \c_space_tl
- \__file_input_pop:
+ \exp_not:N \clist_if_exist:NTF \exp_not:N \@filelist
+ { \exp_not:N \@addtofilelist {#1} }
+ { \seq_gput_right:Nn \exp_not:N \g__file_record_seq {#1} }
+ \exp_not:N \__file_input_push:n {#1}
+ \exp_not:N \tex_input:D
+ \sys_if_engine_luatex:TF
+ { {#1} }
+ { \exp_not:N \__kernel_file_name_quote:n {#1} \scan_stop: }
+ \exp_not:N \__file_input_pop:
}
\cs_generate_variant:Nn \__file_input:n { V }
\cs_new_protected:Npn \__file_input_push:n #1
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex 2019-10-24 21:48:00 UTC (rev 52524)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-10-21}%
+\def\ExplFileDate{2019-10-24}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\def\tempa{LaTeX2e}%
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx 2019-10-24 21:48:00 UTC (rev 52524)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-10-21}%
+\def\ExplFileDate{2019-10-24}%
\let\ExplLoaderFileDate\ExplFileDate
\everyjob\expandafter{\the\everyjob
\message{expl3 <\ExplFileDate> L3 programming layer}%
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty 2019-10-24 21:46:19 UTC (rev 52523)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty 2019-10-24 21:48:00 UTC (rev 52524)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-10-21}%
+\def\ExplFileDate{2019-10-24}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
More information about the tex-live-commits
mailing list