From 6688448c1f00de62d4cb784b2af3e36a75fcce82 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 5 Apr 2018 21:10:40 +0000 Subject: morewrites (5apr18) git-svn-id: svn://tug.org/texlive/trunk@47306 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/morewrites/morewrites.pdf | Bin 699879 -> 715995 bytes .../texmf-dist/doc/latex/morewrites/primargs.pdf | Bin 603450 -> 600793 bytes .../source/latex/morewrites/morewrites.dtx | 112 ++++++++++----------- .../source/latex/morewrites/primargs.dtx | 68 ++++++------- .../texmf-dist/tex/latex/morewrites/morewrites.sty | 12 +-- .../texmf-dist/tex/latex/morewrites/primargs.sty | 8 +- 6 files changed, 100 insertions(+), 100 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf b/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf index 78e649067ef..7780f7081e7 100644 Binary files a/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf and b/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf differ diff --git a/Master/texmf-dist/doc/latex/morewrites/primargs.pdf b/Master/texmf-dist/doc/latex/morewrites/primargs.pdf index b7abbb4308f..acf07455f0f 100644 Binary files a/Master/texmf-dist/doc/latex/morewrites/primargs.pdf and b/Master/texmf-dist/doc/latex/morewrites/primargs.pdf differ diff --git a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx index 384ff71f5d5..d4bb8cc920d 100644 --- a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx +++ b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: morewrites.dtx Copyright (C) 2011-2017 Bruno Le Floch +%% File: morewrites.dtx Copyright (C) 2011-2018 Bruno Le Floch %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -26,7 +26,7 @@ % \title{The \textsf{morewrites} package: \\ % Always room for a new \tn{write}} % \author{Bruno Le Floch} -% \date{2017/04/20} +% \date{2018/04/04} % % \maketitle % \tableofcontents @@ -151,10 +151,10 @@ % %<*package> % \begin{macrocode} -\RequirePackage {expl3} [2017/03/18] -\RequirePackage {primargs} [2017/04/10] +\RequirePackage {expl3} [2018/02/21] +\RequirePackage {primargs} [2018/04/04] \ProvidesExplPackage - {morewrites} {2017/04/20} {} {Always room for a new write} + {morewrites} {2018/04/04} {} {Always room for a new write} % \end{macrocode} % % Quit early under \LuaTeX{}. @@ -282,7 +282,7 @@ % % \subsubsection{Copying some commands} % -% \begin{macro}[aux] +% \begin{macro} % { % \@@_tex_immediate:w , % \@@_tex_openout:w , @@ -299,7 +299,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_tex_newwrite:N} +% \begin{macro}{\@@_tex_newwrite:N} % Copy \tn{newwrite} but making sure that it is % not \tn{outer}. This copy will not be affected by redefinitions % of \tn{newwrite} later on. @@ -311,7 +311,7 @@ % % \subsubsection{Variants} % -% \begin{macro}[aux]{\prop_gpop:NVNT, \prop_gput:NVx, \tl_gput_right:Nv} +% \begin{macro}{\prop_gpop:NVNT, \prop_gput:NVx, \tl_gput_right:Nv} % We need these variants. % \begin{macrocode} \cs_generate_variant:Nn \prop_gpop:NnNT { NV } @@ -329,14 +329,14 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\@@_tmp:w} +% \begin{variable}{\@@_tmp:w} % Used for temporary definitions. % \begin{macrocode} \cs_new_eq:NN \@@_tmp:w ? % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\g_@@_later_int} +% \begin{variable}{\g_@@_later_int} % The integer \cs{g_@@_later_int} labels the various % non-immediate operations in the order in which they appear in the % source. We can never reuse a number because there is no way to know @@ -355,7 +355,7 @@ % \end{variable} % % ^^A todo: populate \g_@@_write_seq because we don't use \newwrite; this should be done in \morewritessetup -% \begin{variable}[aux]{\g_@@_write_seq} +% \begin{variable}{\g_@@_write_seq} % Keep track of \TeX{} stream numbers managed by \pkg{morewrites} that % are currently not in use as user streams. % \begin{macrocode} @@ -363,21 +363,21 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\g_@@_write_prop} +% \begin{variable}{\g_@@_write_prop} % Map user streams to \TeX{} streams. % \begin{macrocode} \prop_new:N \g_@@_write_prop % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\g_@@_write_file_prop} +% \begin{variable}{\g_@@_write_file_prop} % Map user streams with no associated \TeX{} streams to file names. % \begin{macrocode} \prop_new:N \g_@@_write_file_prop % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\l_@@_code_tl} +% \begin{variable}{\l_@@_code_tl} % Stores the code to run after finding a user stream, in % \cs{@@_get_user:n}. % \begin{macrocode} @@ -385,7 +385,7 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\l_@@_user_int, \l_@@_tstr_tl} +% \begin{variable}{\l_@@_user_int, \l_@@_tstr_tl} % The user stream number following redefined primitives is stored in % \cs{l_@@_user_int} (see \cs{@@_get_user:N}). The corresponding % \TeX{} stream number is eventually stored in \cs{l_@@_tstr_tl} (a @@ -396,26 +396,26 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\l_@@_tstr_token} +% \begin{variable}{\l_@@_tstr_token} % This token is given as an argument to \cs{@@_tex_newwrite:N}. % \begin{macrocode} \cs_new_eq:NN \l_@@_tstr_token ? % \end{macrocode} % \end{variable} % -% \begin{macro}[aux]{\s_@@} +% \begin{macro}{\s_@@} % A recognizable version of \cs{scan_stop:}. This is inspired % by\footnote{Historically, this might have happened the other way % around, since the author of this package is also on the \LaTeX3 % Team.} scan marks (see the \pkg{l3quark} module of \LaTeX3), but -% \cs{__scan_new:N} is not used directly, since it is currently -% internal to \LaTeX3. +% \cs{scan_new:N} is not used directly, since it is has been made +% available in \LaTeX3 too recently. % \begin{macrocode} \cs_new_eq:NN \s_@@ \scan_stop: % \end{macrocode} % \end{macro} % -% \begin{variable}[aux]{\g_@@_iow, \g_@@_ior} +% \begin{variable}{\g_@@_iow, \g_@@_ior} % The expansion that \tn{write} performs is impossible to emulate (in \XeTeX{} at least) with % anything else than \tn{write}. We will write on the stream % \cs{g_@@_iow} to the file \cs{g_@@_tmp_file_tl} and read back from @@ -428,7 +428,7 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\g_@@_tmp_file_tl, \g_@@_tmp_file_bool} +% \begin{variable}{\g_@@_tmp_file_tl, \g_@@_tmp_file_bool} % Temporary file used to do the correct expansion for each \tn{write}. % Boolean indicating whether we have already checked that the file can % be used by \pkg{morewrites}: before using a file, the @@ -441,7 +441,7 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\g_@@_group_level_int} +% \begin{variable}{\g_@@_group_level_int} % The group level when \tn{shipout} is called: this is used to % distinguish between explicit boxes and box registers. % \begin{macrocode} @@ -449,7 +449,7 @@ % \end{macrocode} % \end{variable} % -% \begin{variable}[aux]{\g_@@_shipout_box} +% \begin{variable}{\g_@@_shipout_box} % The page to be shipped out. % \begin{macrocode} \box_new:N \g_@@_shipout_box @@ -471,7 +471,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_empty_file:n} +% \begin{macro}{\@@_empty_file:n} % Empties the file \cs{g_@@_tmp_file_tl} by opening it and closing it % right away. This is used when performing \tn{immediate} % \tn{openout}. It is also used to ensure the file used by @@ -488,7 +488,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux,TF]{\@@_if_file_trivial:n} +% \begin{macro}[TF]{\@@_if_file_trivial:n} % True if the file does not exist, or if it is empty. % Only the \texttt{TF} variant is defined. We set % \cs{@@_tmp:w} to \cs{prg_return_true:} or \cs{prg_return_false:} @@ -520,7 +520,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_chk_file:} +% \begin{macro}{\@@_chk_file:} % Check that the file \cs{g_@@_tmp_file_tl} does not exist or is blank. % If not, try the file name obtained by adding |.mw|. % This avoids clobbering files that the user would not want to lose. @@ -553,7 +553,7 @@ % % \subsubsection{Parsing and other helpers} % -% \begin{macro}[aux]{\@@_equals_file:N} +% \begin{macro}{\@@_equals_file:N} % Most of the parsing for primitive arguments is done using % \pkg{primargs}, except for one case we care about: after its % \meta{number} argument, the \tn{openout} primitive expects an @@ -569,7 +569,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_get_user:n} +% \begin{macro}{\@@_get_user:n} % \pkg{primargs} commands only take \texttt{N}-type arguments, but we % often need to find an integer, save it in \cs{l_@@_user_int}, and % run some code |#1|. This is analogous to \cs{primargs_get_number:N}. @@ -583,7 +583,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_user_to_tstr:NTF} +% \begin{macro}{\@@_user_to_tstr:NTF} % The goal is to go from a user stream \cs{l_@@_user_int} to a \TeX{} % stream \cs{l_@@_tstr_tl} (it defaults to the user stream). Streams % less than $19$ are not managed by \pkg{morewrites}: actual \TeX{} @@ -603,8 +603,8 @@ % \end{macrocode} % \end{macro} % -% \begin{variable}[aux]{\l_@@_collect_next_int} -% \begin{macro}[aux] +% \begin{variable}{\l_@@_collect_next_int} +% \begin{macro} % { % \@@_collect:x, \@@_collect_aux:Nn, % \@@_collect_aux:cf, \@@_collect_gput_right:N, \@@_collect_gput_right:c @@ -661,7 +661,7 @@ % \end{macro} % \end{variable} % -% \begin{macro}[aux, EXP]{\@@_user_tl_name:n} +% \begin{macro}[EXP]{\@@_user_tl_name:n} % The name of a global token list variable holding the text of a given % user stream. % \begin{macrocode} @@ -714,8 +714,8 @@ % action} instead of the \meta{code for delayed action} which is run by % default. In both cases, any \meta{further code} is run. % -% \begin{macro}[aux, updated = 2012-12-05]{\@@_immediate:w} -% \begin{macro}[aux]{\@@_immediate_auxii:, \@@_immediate_auxiii:N} +% \begin{macro}[updated = 2012-12-05]{\@@_immediate:w} +% \begin{macro}{\@@_immediate_auxii:, \@@_immediate_auxiii:N} % \TeX{}'s \tn{immediate} primitive raises a flag which is cancelled % after \TeX{} sees a non-expandable token. We use % \cs{primargs_read_x_token:N} to find the next non-expandable token @@ -746,7 +746,7 @@ % either delayed or immediate. In all cases they begin by looking for a % user stream. Here, we implement the immediate versions only. % -% \begin{macro}[aux]{\@@_closeout:w, \@@_closeout_now:, \@@_closeout_now:nn} +% \begin{macro}{\@@_closeout:w, \@@_closeout_now:, \@@_closeout_now:nn} % In the immediate case \cs{@@_closeout_now:}, there are three cases. % The stream may point to a \TeX{} stream, in which case it is closed, % removed from \cs{g_@@_write_prop}, and put back in the list of @@ -796,7 +796,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_openout:w, \@@_openout_now:n} +% \begin{macro}{\@@_openout:w, \@@_openout_now:n} % In the immediate case find a file name, then allocate a \TeX{} % stream if possible, and otherwise point the user stream to a token % list. In all cases, close the stream to avoid losing any material @@ -836,7 +836,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_write:w, \@@_write_now:w, \@@_write_now:n} +% \begin{macro}{\@@_write:w, \@@_write_now:w, \@@_write_now:n} % In the immediate case we use \cs{@@_write_now_open:n} if the stream % points to a token list, and otherwise use the primitive, with the % dummy stream $16$ if closed (the text is then written to the @@ -864,8 +864,8 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_write_now_open:n} -% \begin{macro}[aux]{\@@_write_now_loop:} +% \begin{macro}{\@@_write_now_open:n} +% \begin{macro}{\@@_write_now_loop:} % Only \tn{write} itself can emulate how \tn{write} expands tokens, % because |#| don't have to be doubled, and because the % \tn{newlinechar} has to be changed to new lines. Hence, we start by @@ -918,7 +918,7 @@ % % \subsubsection{Delayed actions} % -% \begin{macro}[aux]{\@@_later:n, \@@_later_do:n} +% \begin{macro}{\@@_later:n, \@@_later_do:n} % Store the action to be done at shipout in a token list, and % non-immediately write the label \cs{g_@@_later_int} of the % output operation to the temporary file. @@ -945,7 +945,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_closeout_later:} +% \begin{macro}{\@@_closeout_later:} % If the user stream is a \TeX{} stream, use the primitive, otherwise % save \cs{@@_closeout_now:} for later. % \begin{macrocode} @@ -958,7 +958,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_openout_later:w, \@@_openout_later:n} +% \begin{macro}{\@@_openout_later:w, \@@_openout_later:n} % If the user stream is a \TeX{} stream use the primitive, otherwise % find a file name and call \cs{@@_openout_now:n} later. % \begin{macrocode} @@ -973,7 +973,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_write_later:w, \@@_write_later:n, \@@_write_later_aux:n} +% \begin{macro}{\@@_write_later:w, \@@_write_later:n, \@@_write_later_aux:n} % For \TeX{} streams use the primitive, otherwise find a general text % and save it for later; the auxiliary is very similar to % \cs{@@_write_now:w}. @@ -1011,7 +1011,7 @@ % on the left (then \cs{tex_newlinechar:D} cannot be equal to the % delimiter), and at least one non-digit character on the right. % -% \begin{macro}[aux]{\@@_before_shipout:} +% \begin{macro}{\@@_before_shipout:} % Immediately before the shipout, we must open the writing stream % \cs{g_@@_iow} (after making sure we are allowed to alter the % auxiliary file). @@ -1025,8 +1025,8 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_after_shipout:} -% \begin{macro}[aux, rEXP]{\@@_after_shipout_loop:ww} +% \begin{macro}{\@@_after_shipout:} +% \begin{macro}[rEXP]{\@@_after_shipout_loop:ww} % Immediately after all the \tn{write}s are performed, close the file, % then read the file with \tn{endlinechar} set to % \tn{newlinechar}\footnote{Note that the \tn{newlinechar} used by @@ -1076,8 +1076,8 @@ % \end{macro} % \end{macro} % -% \begin{macro}[aux]{\@@_shipout:w} -% \begin{macro}[aux]{\@@_shipout_i:, \@@_shipout_ii:} +% \begin{macro}{\@@_shipout:w} +% \begin{macro}{\@@_shipout_i:, \@@_shipout_ii:} % Grab the shipped out box using \tn{setbox} and regain control using % \tn{afterassignment}. There are two cases: either the box is given % as \tn{box} or \tn{copy} followed by a number, in which case @@ -1109,7 +1109,7 @@ % \end{macro} % \end{macro} % -% \begin{macro}[aux]{\shipout, \@@_tex_shipout:w} +% \begin{macro}{\shipout, \@@_tex_shipout:w} % The task is now to locate the shipout primitive, which may have been % renamed and hooked into by many different packages loaded before % \pkg{morewrites}. Any of those control sequences which are equal to @@ -1157,7 +1157,7 @@ % % \subsubsection{Hook at the very end} % -% \begin{macro}[aux]{\@@_close_all:} +% \begin{macro}{\@@_close_all:} % At the end of the document, close all the files. % \begin{macrocode} \cs_new_protected:Npn \@@_close_all: @@ -1172,7 +1172,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_close_all_at_end:nw} +% \begin{macro}{\@@_close_all_at_end:nw} % At the end of the run, we try very hard to put some material at the % \tn{@@end}, just in case some other very late code writes to files % that are not yet closed. This is tried at most $5$~times, to avoid @@ -1194,18 +1194,18 @@ % % \subsubsection{Modified \tn{newwrite}} % -% \begin{variable}[aux]{\g_@@_alloc_write_int} +% \begin{variable}{\g_@@_alloc_write_int} % Counter to allocate user streams. Initialized to $18$ so that the % first user stream allocated by \pkg{morewrites} is $19$. Indeed, % $18$ is reserved for shell commands and packages may expect $16$ or % $17$ to write to the terminal. % \begin{macrocode} \int_new:N \g_@@_alloc_write_int -\int_set:Nn \g_@@_alloc_write_int { 18 } +\int_gset:Nn \g_@@_alloc_write_int { 18 } % \end{macrocode} % \end{variable} % -% \begin{macro}[aux]{\@@_newwrite:N} +% \begin{macro}{\@@_newwrite:N} % Reimplementation of \tn{newwrite} but protected and using a counter % \cs{g_@@_alloc_write_int} instead of what \TeX{}/\LaTeXe{} use. % \begin{macrocode} @@ -1224,7 +1224,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_allocate:n} +% \begin{macro}{\@@_allocate:n} % Raise to |#1| the number of \tn{write} streams allocated to \pkg{morewrites}. % \begin{macrocode} \cs_new_protected:Npn \@@_allocate:n #1 @@ -1239,7 +1239,7 @@ } { \@@_tex_newwrite:N \l_@@_tstr_token - \seq_put_right:NV \g_@@_write_seq \l_@@_tstr_token + \seq_gput_right:NV \g_@@_write_seq \l_@@_tstr_token } } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/morewrites/primargs.dtx b/Master/texmf-dist/source/latex/morewrites/primargs.dtx index 851263575a6..c911233ea97 100644 --- a/Master/texmf-dist/source/latex/morewrites/primargs.dtx +++ b/Master/texmf-dist/source/latex/morewrites/primargs.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: primargs.dtx Copyright (C) 2012-2017 Bruno Le Floch +%% File: primargs.dtx Copyright (C) 2012-2018 Bruno Le Floch %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -23,7 +23,7 @@ % \title{The \textsf{primargs} package: \\ % Parsing arguments of primitives} % \author{Bruno Le Floch} -% \date{2017/04/10} +% \date{2018/04/04} % % \maketitle % \tableofcontents @@ -199,7 +199,7 @@ % \end{texnote} % \end{function} % -% \subsection{Comments and internal functions} +% \subsection{Comments} % % This package is not idiomatic \pkg{expl3} and should not be used as an % example of good coding practices. It uses \cs[no-index]{\ldots{}:D} @@ -218,20 +218,6 @@ % code with \pkg{expl3}; go and see Joseph Wright's \pkg{siunitx} for % instance.} % -% \begin{function}{\__primargs_get_rhs:NnN, \__primargs_get_rhs:NoN} -% \begin{syntax} -% \cs{__primargs_get_rhs:NnN} \meta{register} \Arg{register rhs} \meta{function} -% \end{syntax} -% Use the \meta{register} to find a right-hand side of a valid -% assignment for this type of variable, and feed the value found to -% the \meta{function}. The value of the \meta{register} is then -% restored using \meta{register} |=| \meta{register rhs}, where the -% \meta{register rhs} should be the initial value of the -% \meta{register}. All those assignments are performed within a -% group, but some are automatically global, and \tn{globaldefs} may -% cause trouble with others. -% \end{function} -% % Despite large efforts expended to make this package robust against % changes to the \tn{globaldefs} parameter, setting it to a non-zero % value may make some parts of this package crash. @@ -262,18 +248,32 @@ % %<*package> % \begin{macrocode} -\RequirePackage {expl3} [2017/03/18] +\RequirePackage {expl3} [2018/02/21] \ProvidesExplPackage - {primargs} {2017/04/10} {} {Parsing arguments of primitives} + {primargs} {2018/04/04} {} {Parsing arguments of primitives} % \end{macrocode} % % \begin{macrocode} %<@@=primargs> % \end{macrocode} % +% \begin{function}{\__primargs_get_rhs:NnN, \__primargs_get_rhs:NoN} +% \begin{syntax} +% \cs{__primargs_get_rhs:NnN} \meta{register} \Arg{register rhs} \meta{function} +% \end{syntax} +% Use the \meta{register} to find a right-hand side of a valid +% assignment for this type of variable, and feed the value found to +% the \meta{function}. The value of the \meta{register} is then +% restored using \meta{register} |=| \meta{register rhs}, where the +% \meta{register rhs} should be the initial value of the +% \meta{register}. All those assignments are performed within a +% group, but some are automatically global, and \tn{globaldefs} may +% cause trouble with others. +% \end{function} +% % \subsection{Variables and helpers} % -% \begin{macro}[aux]{\g_@@_code_tl} +% \begin{macro}{\g_@@_code_tl} % Used to contain temporary code. % \begin{macrocode} \tl_new:N \g_@@_code_tl @@ -289,7 +289,7 @@ % \end{macrocode} % \end{variable} % -% \begin{macro}[aux]{\@@_safe:} +% \begin{macro}{\@@_safe:} % This function, which must be called in a group, cancels any % \tn{afterassignment} token and makes the \tn{globaldefs} parameter % non-negative. This ensures that assignments prefixed with @@ -338,7 +338,7 @@ % to see how \tn{next} changes from \tn{relax} to becoming a macro. % % \begin{macro}{\primargs_read_x_token:N} -% \begin{macro}[aux] +% \begin{macro} % { % \@@_read_x_token:N, \@@_read_x_token_aux:N, % \@@_read_x_token_std:N, \@@_read_x_token_file:N @@ -427,7 +427,7 @@ % \end{macro} % % \begin{macro}{\primargs_remove_one_optional_space:N} -% \begin{macro}[aux]{\@@_remove_one_optional_space:} +% \begin{macro}{\@@_remove_one_optional_space:} % Start a group: we will insert the \meta{function} at its end. % \begin{macrocode} \cs_new_protected:Npn \primargs_remove_one_optional_space:N #1 @@ -449,7 +449,7 @@ % \end{macro} % % \begin{macro}{\primargs_remove_optional_spaces:N} -% \begin{macro}[aux] +% \begin{macro} % {\@@_remove_optional_spaces:, \@@_remove_optional_spaces_aux:} % Start a group, make assignments safe, then recursively expand tokens % and remove any token with catcode~$10$ (space). Once another token @@ -478,7 +478,7 @@ % \end{macro} % % \begin{macro}{\primargs_remove_equals:N} -% \begin{macro}[aux]{\@@_remove_equals:, \@@_remove_equals_aux:NN} +% \begin{macro}{\@@_remove_equals:, \@@_remove_equals_aux:NN} % Remove \meta{optional spaces}, then test for an explicit~|=|, both % in \tn{meaning} and as a token list: once we know its \tn{meaning}, % we can grab it safely. @@ -503,7 +503,7 @@ % \end{macro} % % \begin{macro}{\primargs_remove_filler:N} -% \begin{macro}[aux] +% \begin{macro} % { % \@@_remove_filler:, % \@@_remove_filler_aux:, @@ -659,7 +659,7 @@ % \end{macro} % % \begin{macro}{\primargs_get_general_text:N} -% \begin{macro}[aux] +% \begin{macro} % {\@@_get_general_text:, \@@_get_general_text_error:n} % Getting a \meta{general text} is more tricky, as an assignment to % \tn{errhelp} (for instance) would also allow constructions such as @@ -730,7 +730,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_get_file_name_test:} +% \begin{macro}{\@@_get_file_name_test:} % The token read is in \cs{g_primargs_token}, and is non-expandable. % If it is a control sequence, end the \meta{file name}. Spaces are % special (quotes too, but that is treated elsewhere). Otherwise, @@ -750,7 +750,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_get_file_name_end:} +% \begin{macro}{\@@_get_file_name_end:} % When the end of the file name is reached, reinstate the original % definition of |read_x_token| so as to make \tn{input} expandable % again, then end the group, after @@ -765,7 +765,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_get_file_name_space:} +% \begin{macro}{\@@_get_file_name_space:} % We have already removed the space from the input stream. If % there is an odd number of quotes so far, add a space to the % file name and continue. Otherwise the file name ends. @@ -782,8 +782,8 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[aux]{\@@_get_file_name_char:} -% \begin{macro}[aux, EXP] +% \begin{macro}{\@@_get_file_name_char:} +% \begin{macro}[EXP] % {\@@_get_file_name_char_ii:w, \@@_get_file_name_char_iii:w} % Check for a quote, which switches \cs{g_@@_file_name_level_tl} % from $0$ to $1$ or back. @@ -801,7 +801,7 @@ { \token_if_eq_charcode:NNT " \g_primargs_token { - \tl_set:Nx \g_@@_file_name_level_tl + \tl_gset:Nx \g_@@_file_name_level_tl { \int_eval:n { 1 - \g_@@_file_name_level_tl } } } \tl_gput_right:Nx \g_@@_file_name_tl @@ -820,7 +820,7 @@ % \end{macro} % % \begin{macro}{\primargs_get_input_file_name:N} -% \begin{macro}[aux] +% \begin{macro} % { % \@@_get_input_file_name_first:, % \@@_get_input_file_name_loop:, \@@_get_input_file_name_test:, diff --git a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty index a337c6fc865..061ecec8656 100644 --- a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty +++ b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty @@ -9,7 +9,7 @@ %% Communicate any suggestions for changing this package %% to Bruno Le Floch (blflatex@gmail.com). %% -%% File: morewrites.dtx Copyright (C) 2011-2017 Bruno Le Floch +%% File: morewrites.dtx Copyright (C) 2011-2018 Bruno Le Floch %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -19,10 +19,10 @@ %% http://www.latex-project.org/lppl.txt %% %% ----------------------------------------------------------------------- -\RequirePackage {expl3} [2017/03/18] -\RequirePackage {primargs} [2017/04/10] +\RequirePackage {expl3} [2018/02/21] +\RequirePackage {primargs} [2018/04/04] \ProvidesExplPackage - {morewrites} {2017/04/20} {} {Always room for a new write} + {morewrites} {2018/04/04} {} {Always room for a new write} \sys_if_engine_luatex:T { \cs_new_protected:Npn \morewritessetup #1 { } @@ -449,7 +449,7 @@ } \AtEndDocument { \__morewrites_close_all_at_end:nw { 5 } } \int_new:N \g__morewrites_alloc_write_int -\int_set:Nn \g__morewrites_alloc_write_int { 18 } +\int_gset:Nn \g__morewrites_alloc_write_int { 18 } \cs_new_protected:Npn \__morewrites_newwrite:N #1 { \int_gincr:N \g__morewrites_alloc_write_int @@ -474,7 +474,7 @@ } { \__morewrites_tex_newwrite:N \l__morewrites_tstr_token - \seq_put_right:NV \g__morewrites_write_seq \l__morewrites_tstr_token + \seq_gput_right:NV \g__morewrites_write_seq \l__morewrites_tstr_token } } \cs_new_protected:Npn \morewritessetup #1 diff --git a/Master/texmf-dist/tex/latex/morewrites/primargs.sty b/Master/texmf-dist/tex/latex/morewrites/primargs.sty index 908e61f948d..0c67d4b7b48 100644 --- a/Master/texmf-dist/tex/latex/morewrites/primargs.sty +++ b/Master/texmf-dist/tex/latex/morewrites/primargs.sty @@ -9,7 +9,7 @@ %% Communicate any suggestions for changing this package %% to Bruno Le Floch (blflatex@gmail.com). %% -%% File: primargs.dtx Copyright (C) 2012-2017 Bruno Le Floch +%% File: primargs.dtx Copyright (C) 2012-2018 Bruno Le Floch %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -19,9 +19,9 @@ %% http://www.latex-project.org/lppl.txt %% %% ----------------------------------------------------------------------- -\RequirePackage {expl3} [2017/03/18] +\RequirePackage {expl3} [2018/02/21] \ProvidesExplPackage - {primargs} {2017/04/10} {} {Parsing arguments of primitives} + {primargs} {2018/04/04} {} {Parsing arguments of primitives} \tl_new:N \g__primargs_code_tl \tl_new:N \g__primargs_file_name_tl \tl_new:N \g__primargs_file_name_level_tl @@ -259,7 +259,7 @@ { \token_if_eq_charcode:NNT " \g_primargs_token { - \tl_set:Nx \g__primargs_file_name_level_tl + \tl_gset:Nx \g__primargs_file_name_level_tl { \int_eval:n { 1 - \g__primargs_file_name_level_tl } } } \tl_gput_right:Nx \g__primargs_file_name_tl -- cgit v1.2.3