diff options
| author | Karl Berry <karl@freefriends.org> | 2019-01-14 22:06:37 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-01-14 22:06:37 +0000 |
| commit | 6950156f10651c7d5f976001ab97f0e8e5bcffb4 (patch) | |
| tree | ee684e58ee9234f7be1395c8bc17652828f5059d /Master | |
| parent | 255e3d2ea38b32c1acf26bbb1e92c8ec562abdfc (diff) | |
l3kernel (14jan19)
git-svn-id: svn://tug.org/texlive/trunk@49704 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
73 files changed, 226 insertions, 149 deletions
diff --git a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md index 43fab4c3deb..d973ba34b1e 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md @@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +### Added + +- `\ior_map_variable:NNn` and `\ior_str_map_variable:NNn` + +## [2019-01-13] + +### Fixed + +- Unclosed conditional with Unicode engines + ## [2019-01-12] ### Changed @@ -230,7 +240,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2019-01-12...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2019-01-13...HEAD +[2019-01-13]: https://github.com/latex3/latex3/compare/2019-01-12...2019-01-13 [2019-01-12]: https://github.com/latex3/latex3/compare/2019-01-01...2019-01-12 [2019-01-01]: https://github.com/latex3/latex3/compare/2018-12-12...2019-01-01 [2018-12-12]: https://github.com/latex3/latex3/compare/2018-12-11...2018-12-12 diff --git a/Master/texmf-dist/doc/latex/l3kernel/README.md b/Master/texmf-dist/doc/latex/l3kernel/README.md index 3d60a73d5c7..9c565157215 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/README.md +++ b/Master/texmf-dist/doc/latex/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2019-01-12 +Release 2019-01-13 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf Binary files differindex 2efd8f15a13..48fe6f97fe1 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf +++ b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf Binary files differindex 0bbdb240f56..92c8d98e28c 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf +++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex index 064d3a13924..128b8d41cd2 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex @@ -52,7 +52,7 @@ {latex-team@latex-project.org}% }% } -\date{Released 2019-01-12} +\date{Released 2019-01-13} \pagenumbering{roman} \maketitle diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf Binary files differindex c6f1929538a..dc6fc49b3cd 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf +++ b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf Binary files differindex 8337aef5478..d8ad44cfd03 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf +++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex index 39371eea515..ed13c4ca371 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex @@ -30,7 +30,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-01-12} +\date{Released 2019-01-13} \begin{document} diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf Binary files differindex db36d532135..bbb0b39a65a 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf +++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex index ad7728ce9db..a660dd9cf0f 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex @@ -30,7 +30,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-01-12} +\date{Released 2019-01-13} \newcommand{\TF}{\textit{(TF)}} diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf Binary files differindex 878eba8154a..6d7089c9c37 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf +++ b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex index 729f06bab61..320787a53d5 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex @@ -30,7 +30,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-01-12} +\date{Released 2019-01-13} \newcommand{\TF}{\textit{(TF)}} diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf Binary files differindex 629a661fb15..b13bcc68fb5 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf +++ b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.tex b/Master/texmf-dist/doc/latex/l3kernel/source3.tex index a7ade309819..44969811d2f 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/source3.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/source3.tex @@ -51,7 +51,7 @@ {latex-team@latex-project.org}% }% } -\date{Released 2019-01-12} +\date{Released 2019-01-13} \pagenumbering{roman} \maketitle diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index 615f179bb16..73eb2f404c3 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -21,7 +21,7 @@ % for those people who are interested. % %<*driver|generic|package> -\def\ExplFileDate{2019-01-12}% +\def\ExplFileDate{2019-01-13}% %</driver|generic|package> %<*driver> \documentclass[full]{l3doc} @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx index 94e523ea661..68446087540 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx index 03bd6180794..c18e497be61 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx index 2ce2f3b2e11..22b0b8a366b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx @@ -138,7 +138,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx index ef4a9b2d763..281c910e1ce 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % @@ -133,7 +133,8 @@ % \cs{box_use:N} \meta{box} % \end{syntax} % Inserts the current content of the \meta{box} onto the current -% list for typesetting. +% list for typesetting. An error is raised if the variable does +% not exist or if it is invalid. % \begin{texnote} % This is the \TeX{} primitive \tn{copy}. % \end{texnote} @@ -144,7 +145,10 @@ % \cs{box_use_drop:N} \meta{box} % \end{syntax} % Inserts the current content of the \meta{box} onto the current -% list for typesetting. The \meta{box} is then cleared at the group level the +% list for typesetting. An error is raised if the variable does +% not exist or if it is invalid. +% +% The \meta{box} is then cleared at the group level the % box was set at, \emph{i.e.}~the current content is \enquote{dropped} entirely. % For example, with % \begin{verbatim} @@ -158,13 +162,13 @@ % \group_end: % \box_show:N \l_tmpa_box % \end{verbatim} -% the first use of |\box_show:N| will show an entirely cleared (void) box, and the +% the first use of \cs{box_show:N} will show an entirely cleared (void) box, and the % second will show the letter |A| in the box. % % This function is useful as boxes can contain an open-ended amount of material. As % such, they can have a significant memory impact on \TeX{}. At the same time, it is % often the case that once a box has been inserted, it is no longer needed at all. -% Using |\box_use_drop:N| in these circumstances therefore offers improved memory +% Using \cs{box_use_drop:N} in these circumstances therefore offers improved memory % use and performance. It should therefore be preferred over \cs{box_use:N} where % it is clear that the content is no longer needed in the variable. % \begin{texnote} @@ -181,8 +185,8 @@ % such that its reference point is displaced horizontally by the given % \meta{dimexpr} from the reference point for typesetting, to the right % or left as appropriate. The \meta{box function} should be -% a box operation such as |\box_use:N \<box>| or a \enquote{raw} -% box specification such as |\vbox:n { xyz }|. +% a box operation such as \cs{box_use:N} |\<box>| or a \enquote{raw} +% box specification such as \cs{vbox:n} |{ xyz }|. % \end{function} % % \begin{function}{\box_move_up:nn, \box_move_down:nn} @@ -194,8 +198,8 @@ % such that its reference point is displaced vertically by the given % \meta{dimexpr} from the reference point for typesetting, up % or down as appropriate. The \meta{box function} should be -% a box operation such as |\box_use:N \<box>| or a \enquote{raw} -% box specification such as |\vbox:n { xyz }|. +% a box operation such as \cs{box_use:N} |\<box>| or a \enquote{raw} +% box specification such as \cs{vbox:n} |{ xyz }|. % \end{function} % % \section{Measuring and setting box dimensions} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx index c23a8825320..59509d55283 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % @@ -404,6 +404,36 @@ % \end{texnote} % \end{function} % +% \begin{function}[added = 2019-01-13]{\ior_map_variable:NNn} +% \begin{syntax} +% \cs{ior_map_variable:NNn} \meta{stream} \meta{tl~var} \Arg{code} +% \end{syntax} +% For each set of \meta{lines} obtained by calling \cs{ior_get:NN} +% until reaching the end of the file, stores the \meta{lines} in the +% \meta{tl~var} then applies the \meta{code}. The \meta{code} will +% usually make use of the \meta{variable}, but this is not enforced. +% The assignments to the \meta{variable} are local. \TeX{} ignores +% any trailing new-line marker from the file it reads. +% This function is typically faster than \cs{ior_map_inline:Nn}. +% \end{function} +% +% \begin{function}[added = 2019-01-13]{\ior_str_map_variable:NNn} +% \begin{syntax} +% \cs{ior_str_map_variable:NNn} \meta{stream} \meta{tl~var} \Arg{code} +% \end{syntax} +% For each \meta{line} in the \meta{stream}, stores the \meta{line} in +% the \meta{tl~var} then applies the \meta{code}. The material is +% read from the \meta{stream} as a series of tokens with category code +% $12$ (other), with the exception of space characters which are given +% category code $10$ (space). The \meta{code} will usually make use +% of the \meta{variable}, but this is not enforced. The assignments +% to the \meta{variable} are local. Note that \TeX{} removes trailing +% space and tab characters (character codes 32 and 9) from every line +% upon input. \TeX{} also ignores any trailing new-line marker from +% the file it reads. +% This function is typically faster than \cs{ior_str_map_inline:Nn}. +% \end{function} +% % \begin{function}[added = 2018-12-29]{\iow_allow_break:} % \begin{syntax} % \cs{iow_allow_break:} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx index 2972346e50b..c069b5cb9da 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach, +%% File: l3clist.dtx Copyright (C) 2004-2011,2019 Frank Mittelbach, %% The LaTeX3 project %% (C) 2012-2019 The LaTeX3 Project % @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx index 59cf147c27b..83fbbc8f593 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx b/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx index 1946a9a269e..6611138e8ff 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx index 5015598e4d6..0f0b345b67a 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx index 01bc02e5e31..d33b28c5860 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx @@ -77,7 +77,7 @@ and all files in that bundle must be distributed together. % % \title{The \cls{l3doc} class} % \author{\Team} -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % \maketitle % \tableofcontents % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx index 175b865f832..4dffd5e6fcb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx index 4028ef36d1c..41628e06ebb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3drivers.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % @@ -554,23 +554,23 @@ %<*package> \ProvidesExplFile %<*dvipdfmx> - {l3dvidpfmx.def}{2019-01-12}{} + {l3dvidpfmx.def}{2019-01-13}{} {L3 Experimental driver: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3dvips.def}{2019-01-12}{} + {l3dvips.def}{2019-01-13}{} {L3 Experimental driver: dvips} %</dvips> %<*dvisvgm> - {l3dvisvgm.def}{2019-01-12}{} + {l3dvisvgm.def}{2019-01-13}{} {L3 Experimental driver: dvisvgm} %</dvisvgm> %<*pdfmode> - {l3pdfmode.def}{2019-01-12}{} + {l3pdfmode.def}{2019-01-13}{} {L3 Experimental driver: PDF mode} %</pdfmode> %<*xdvipdfmx> - {l3xdvidpfmx.def}{2019-01-12}{} + {l3xdvidpfmx.def}{2019-01-13}{} {L3 Experimental driver: xdvipdfmx} %</xdvipdfmx> %</package> diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx index e6794c011d3..fce3c20242e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index c6edd31bf4e..75130a10858 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % @@ -978,7 +978,8 @@ % \begin{macro}{\@@_map_inline_loop:NNN} % Mapping to an input stream can be done on either a token or a string % basis, hence the set up. Within that, there is a check to avoid reading -% past the end of a file, hence the two applications of \cs{ior_if_eof:N}. +% past the end of a file, hence the two applications of \cs{ior_if_eof:N} +% and its lower-level analogue \cs{if_eof:w}. % This mapping cannot be nested with twice the same stream, as the % stream has only one \enquote{current line}. % \begin{macrocode} @@ -1003,10 +1004,10 @@ { #2 #3 \l_@@_internal_tl \if_eof:w #3 - \exp_after:wN \use_none:nnnnnnn + \exp_after:wN \ior_map_break: \fi: - \exp_args:No #1 \l_@@_internal_tl - \@@_map_inline_loop:NNN #1#2#3 + \exp_args:No #1 \l_@@_internal_tl + \@@_map_inline_loop:NNN #1#2#3 } % \end{macrocode} % \end{macro} @@ -1014,6 +1015,37 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\ior_map_variable:NNn, \ior_str_map_variable:NNn} +% \begin{macro}{\@@_map_variable:NNNn} +% \begin{macro}{\@@_map_variable_loop:NNNn} +% Since the \TeX{} primitive (\tn{read} or \tn{readline}) assigns the +% tokens read in the same way as a token list assignment, we simply +% call the appropriate primitive. The end-of-loop is checked using +% the primitive conditional for speed. +% \begin{macrocode} +\cs_new_protected:Npn \ior_map_variable:NNn + { \@@_map_variable:NNNn \ior_get:NN } +\cs_new_protected:Npn \ior_str_map_variable:NNn + { \@@_map_variable:NNNn \ior_str_get:NN } +\cs_new_protected:Npn \@@_map_variable:NNNn #1#2#3#4 + { + \ior_if_eof:NF #2 { \@@_map_variable_loop:NNNn #1#2#3 {#4} } + \prg_break_point:Nn \ior_map_break: { } + } +\cs_new_protected:Npn \@@_map_variable_loop:NNNn #1#2#3#4 + { + #1 #2 #3 + \if_eof:w #2 + \exp_after:wN \ior_map_break: + \fi: + #4 + \@@_map_variable_loop:NNNn #1#2#3 {#4} + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % \subsection{Output operations} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx index 3909edc9159..dfdd9fa3d65 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx index f8c2d33457d..a927922da8e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx index 32c94b8f302..a215a574742 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % \maketitle % % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx index fc59a450269..51440d490a9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx index 7c2ee489d77..56b66cc108a 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx index c1de61c7a8a..78a2edd6dbd 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx index 31e59bd0fef..b1e0634f82b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx index 13e93ca1ea8..996574dcd6f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx index 60d6921182f..86e20b1c863 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx index 1e7f9f81b96..b6c51c5ba64 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx index 2167fbaf477..c352dce9ded 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx index 9ab4fb5c80d..fcff6062512 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx index 74bce8be725..18c72878f56 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % \maketitle % % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx index 5e49a6eca0f..a174ea0369e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx @@ -38,7 +38,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx index 8de76e43c29..add8932dab5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx index 29f4f0c18fc..702c67415c2 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx index 7e187b3317f..cf431631a52 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx index 19cc4701f72..ec1413b5f13 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx index d44e2b3f7d6..c5bf6831f8a 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx index 131d1a2ebab..714981e3690 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx index 22c09709aac..69b5259d2af 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx index 5ee6fdf4a06..19e088591d0 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx index a3a72edd0d8..cdb4b644cf4 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx index 2fec4a8a024..cc8a354b139 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx index 286596b432c..a838f63da53 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx index eb3a7e1ea61..1e914178aeb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx index d4a4a296ced..e0590775beb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx index 7bf9b87c8b1..d3d84605e69 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx index 7139235e963..ba43b3423a1 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3skip.dtx Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project +%% File: l3skip.dtx Copyright (C) 2004-2011,2019 Frank Mittelbach, The LaTeX3 Project %% (C) 2012-2019 The LaTeX3 Project % % It may be distributed and/or modified under the conditions of the @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx index a69607a88e5..9eb3205101c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx index c9e4f4ed138..e880e334980 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx index c188ce7fc7a..f9186c2e376 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx index f3025067d07..b02fa0654af 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx index 6bd75f94949..e8aee01c660 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx index 7a84c08c24d..d94b08dc5a4 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx index 23a471d1a48..bb483438469 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx @@ -41,7 +41,7 @@ % }^^A % } % -% \date{Released 2019-01-12} +% \date{Released 2019-01-13} % % \maketitle % @@ -103,9 +103,8 @@ } { \exp_not:N \tex_Ucharcat:D - \exp_not:N \tex_number:D #1 ~ - \c_space_tl - \exp_not:N \tex_the:D \tex_catcode:D #1 ~ + #1 ~ + \tex_catcode:D #1 ~ } } % \end{macrocode} @@ -131,12 +130,12 @@ \fi: \fi: } - \ior_map_inline:Nn \g_@@_data_ior + \ior_map_variable:NNn \g_@@_data_ior \l_@@_tmpa_tl { - \cs_set_nopar:Npn \l_@@_tmpa_tl {#1} - \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_space_tl - \@@_data_auxi:w #1 \q_stop + \if_meaning:w \l_@@_tmpa_tl \c_space_tl + \exp_after:wN \ior_map_break: \fi: + \exp_after:wN \@@_data_auxi:w \l_@@_tmpa_tl \q_stop } \ior_close:N \g_@@_data_ior % \end{macrocode} @@ -170,16 +169,13 @@ \@@_generate:n { "#2 } \@@_generate:n { "#3 } \tl_if_blank:nF {#4} - { \@@_generate:n { "#4 } } + { \@@_generate:n { \int_value:w "#4 } } } } \ior_str_map_inline:Nn \g_@@_data_ior { - \cs_set_nopar:Npn \l_@@_tmpa_tl {#1} - \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_empty_tl - \reverse_if:N \if:w \tl_head:n { #1 ? } \c_hash_str - \@@_data_auxi:w #1 \q_stop - \fi: + \reverse_if:N \if:w \c_hash_str \tl_head:w #1 \c_hash_str \q_stop + \@@_data_auxi:w #1 \q_stop \fi: } \ior_close:N \g_@@_data_ior @@ -213,24 +209,19 @@ } \ior_str_map_inline:Nn \g_@@_data_ior { - \cs_set_nopar:Npn \l_@@_tmpa_tl {#1} - \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_empty_tl - \if:w \tl_head:n { #1 ? } \c_hash_str - \cs_set_nopar:Npx \l_@@_tmpb_tl - { - \c_hash_str \c_space_tl - \tl_to_str:n { Conditional~Mappings } - } - \if_meaning:w \l_@@_tmpa_tl \l_@@_tmpb_tl - \exp_after:wN \exp_after:wN \exp_after:wN \ior_map_break: - \fi: - \else: - \@@_data_auxi:w #1 \q_stop - \fi: - \fi: + \str_if_eq:eeTF + { \tl_head:w #1 \c_hash_str \q_stop } + { \c_hash_str } + { + \str_if_eq:eeT + {#1} + { \c_hash_str \c_space_tl Conditional~Mappings } + { \ior_map_break: } + } + { \@@_data_auxi:w #1 \q_stop } } \ior_close:N \g_@@_data_ior - \group_end: + \group_end: } % \end{macrocode} % For the $8$-bit engines, the above is skipped but there is still some diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 86c7aecf56b..2345b6effe0 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-2019 The LaTeX3 Project -\def\ExplFileDate{2019-01-12}% +\def\ExplFileDate{2019-01-13}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -7776,7 +7776,7 @@ { \str_if_eq_p:Vn \c_sys_output_str { pdf } } \__sys_const:nn { sys_if_rand_exist } { \cs_if_exist_p:N \tex_uniformdeviate:D } -%% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach, +%% File: l3clist.dtx Copyright (C) 2004-2011,2019 Frank Mittelbach, %% The LaTeX3 project %% (C) 2012-2019 The LaTeX3 Project \cs_new_eq:NN \c_empty_clist \c_empty_tl @@ -10515,10 +10515,28 @@ { #2 #3 \l__ior_internal_tl \if_eof:w #3 - \exp_after:wN \use_none:nnnnnnn + \exp_after:wN \ior_map_break: \fi: - \exp_args:No #1 \l__ior_internal_tl - \__ior_map_inline_loop:NNN #1#2#3 + \exp_args:No #1 \l__ior_internal_tl + \__ior_map_inline_loop:NNN #1#2#3 + } +\cs_new_protected:Npn \ior_map_variable:NNn + { \__ior_map_variable:NNNn \ior_get:NN } +\cs_new_protected:Npn \ior_str_map_variable:NNn + { \__ior_map_variable:NNNn \ior_str_get:NN } +\cs_new_protected:Npn \__ior_map_variable:NNNn #1#2#3#4 + { + \ior_if_eof:NF #2 { \__ior_map_variable_loop:NNNn #1#2#3 {#4} } + \prg_break_point:Nn \ior_map_break: { } + } +\cs_new_protected:Npn \__ior_map_variable_loop:NNNn #1#2#3#4 + { + #1 #2 #3 + \if_eof:w #2 + \exp_after:wN \ior_map_break: + \fi: + #4 + \__ior_map_variable_loop:NNNn #1#2#3 {#4} } \int_const:Nn \c_log_iow { -1 } \int_const:Nn \c_term_iow @@ -11214,7 +11232,7 @@ which~will~be~wrapped~using~#1. \tl_if_empty:nF {#3} { ~ It~was~called~with~argument~'#3'. } } -%% File: l3skip.dtx Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project +%% File: l3skip.dtx Copyright (C) 2004-2011,2019 Frank Mittelbach, The LaTeX3 Project %% (C) 2012-2019 The LaTeX3 Project \cs_new_eq:NN \if_dim:w \tex_ifdim:D \cs_new_eq:NN \__dim_eval:w \tex_dimexpr:D @@ -24934,9 +24952,8 @@ } { \exp_not:N \tex_Ucharcat:D - \exp_not:N \tex_number:D #1 ~ - \c_space_tl - \exp_not:N \tex_the:D \tex_catcode:D #1 ~ + #1 ~ + \tex_catcode:D #1 ~ } } \ior_open:Nn \g__char_data_ior { UnicodeData.txt } @@ -24956,12 +24973,12 @@ \fi: \fi: } - \ior_map_inline:Nn \g__char_data_ior + \ior_map_variable:NNn \g__char_data_ior \l__char_tmpa_tl { - \cs_set_nopar:Npn \l__char_tmpa_tl {#1} - \reverse_if:N \if_meaning:w \l__char_tmpa_tl \c_space_tl - \__char_data_auxi:w #1 \q_stop + \if_meaning:w \l__char_tmpa_tl \c_space_tl + \exp_after:wN \ior_map_break: \fi: + \exp_after:wN \__char_data_auxi:w \l__char_tmpa_tl \q_stop } \ior_close:N \g__char_data_ior \ior_open:Nn \g__char_data_ior { CaseFolding.txt } @@ -24987,16 +25004,13 @@ \__char_generate:n { "#2 } \__char_generate:n { "#3 } \tl_if_blank:nF {#4} - { \__char_generate:n { "#4 } } + { \__char_generate:n { \int_value:w "#4 } } } } \ior_str_map_inline:Nn \g__char_data_ior { - \cs_set_nopar:Npn \l__char_tmpa_tl {#1} - \reverse_if:N \if_meaning:w \l__char_tmpa_tl \c_empty_tl - \reverse_if:N \if:w \tl_head:n { #1 ? } \c_hash_str - \__char_data_auxi:w #1 \q_stop - \fi: + \reverse_if:N \if:w \c_hash_str \tl_head:w #1 \c_hash_str \q_stop + \__char_data_auxi:w #1 \q_stop \fi: } \ior_close:N \g__char_data_ior @@ -25025,24 +25039,19 @@ } \ior_str_map_inline:Nn \g__char_data_ior { - \cs_set_nopar:Npn \l__char_tmpa_tl {#1} - \reverse_if:N \if_meaning:w \l__char_tmpa_tl \c_empty_tl - \if:w \tl_head:n { #1 ? } \c_hash_str - \cs_set_nopar:Npx \l__char_tmpb_tl - { - \c_hash_str \c_space_tl - \tl_to_str:n { Conditional~Mappings } - } - \if_meaning:w \l__char_tmpa_tl \l__char_tmpb_tl - \exp_after:wN \exp_after:wN \exp_after:wN \ior_map_break: - \fi: - \else: - \__char_data_auxi:w #1 \q_stop - \fi: - \fi: + \str_if_eq:eeTF + { \tl_head:w #1 \c_hash_str \q_stop } + { \c_hash_str } + { + \str_if_eq:eeT + {#1} + { \c_hash_str \c_space_tl Conditional~Mappings } + { \ior_map_break: } + } + { \__char_data_auxi:w #1 \q_stop } } \ior_close:N \g__char_data_ior - \group_end: + \group_end: } { \group_begin: diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 055504a318f..ad278a3ee5e 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-2019 The LaTeX3 Project -\def\ExplFileDate{2019-01-12}% +\def\ExplFileDate{2019-01-13}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \def\tempa{LaTeX2e}% diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index 916b6f9dc7c..bead3b912d3 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-2019 The LaTeX3 Project -\def\ExplFileDate{2019-01-12}% +\def\ExplFileDate{2019-01-13}% \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 0758d9633dc..a29c510f511 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-2019 The LaTeX3 Project \ProvidesExplFile - {l3dvidpfmx.def}{2019-01-12}{} + {l3dvidpfmx.def}{2019-01-13}{} {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 b139b5bd720..f631830e073 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-2019 The LaTeX3 Project \ProvidesExplFile - {l3dvips.def}{2019-01-12}{} + {l3dvips.def}{2019-01-13}{} {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 972201ec9f6..88d29744ea5 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-2019 The LaTeX3 Project \ProvidesExplFile - {l3dvisvgm.def}{2019-01-12}{} + {l3dvisvgm.def}{2019-01-13}{} {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 9531b22f3fe..290f78ba9d4 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-2019 The LaTeX3 Project \ProvidesExplFile - {l3pdfmode.def}{2019-01-12}{} + {l3pdfmode.def}{2019-01-13}{} {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 a78664e5f89..b7638254deb 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-2019 The LaTeX3 Project \ProvidesExplFile - {l3xdvidpfmx.def}{2019-01-12}{} + {l3xdvidpfmx.def}{2019-01-13}{} {L3 Experimental driver: xdvipdfmx} \cs_new_eq:NN \__driver_literal:e \tex_special:D \cs_new_protected:Npn \__driver_literal:n #1 |