morewrites (29dec18)

git-svn-id: svn://tug.org/texlive/trunk@49531 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 39 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/morewrites/README.md b/Master/texmf-dist/doc/latex/morewrites/README.md
index 8fdde32361d..aa31c5370a0 100644
--- a/Master/texmf-dist/doc/latex/morewrites/README.md
+++ b/Master/texmf-dist/doc/latex/morewrites/README.md
@@ -1,6 +1,6 @@
 Provide more writing streams in LaTeX
 =====================================
-* E-mail: blflatex@gmail.com
+* E-mail: blflatex+morewrites@gmail.com
 * Released under the LaTeX Project Public License v1.3c or later
   See http://www.latex-project.org/lppl.txt
 
diff --git a/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf b/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf
index 7780f7081e7..4b838b67797 100644
--- a/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf
+++ b/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf
diff --git a/Master/texmf-dist/doc/latex/morewrites/primargs.pdf b/Master/texmf-dist/doc/latex/morewrites/primargs.pdf
index acf07455f0f..d63d7f97a26 100644
--- a/Master/texmf-dist/doc/latex/morewrites/primargs.pdf
+++ b/Master/texmf-dist/doc/latex/morewrites/primargs.pdf
diff --git a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx
index d4bb8cc920d..6e52eff3948 100644
--- a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx
+++ b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx
@@ -9,6 +9,8 @@
 %%
 %%    http://www.latex-project.org/lppl.txt
 %%
+%% This work has the LPPL maintenance status 'maintained'
+%% and the current maintainer is Bruno Le Floch.
 %% -----------------------------------------------------------------------
 %
 %<*driver>
@@ -26,7 +28,7 @@
 % \title{The \textsf{morewrites} package: \\
 %   Always room for a new \tn{write}}
 % \author{Bruno Le Floch}
-% \date{2018/04/04}
+% \date{2018/12/29}
 %
 % \maketitle
 % \tableofcontents
@@ -152,9 +154,9 @@
 %<*package>
 %    \begin{macrocode}
 \RequirePackage {expl3} [2018/02/21]
-\RequirePackage {primargs} [2018/04/04]
+\RequirePackage {primargs} [2018/12/29]
 \ProvidesExplPackage
-  {morewrites} {2018/04/04} {} {Always room for a new write}
+  {morewrites} {2018/12/29} {} {Always room for a new write}
 %    \end{macrocode}
 %
 % Quit early under \LuaTeX{}.
@@ -506,7 +508,7 @@
         \cs_gset_eq:NN \@@_tmp:w \prg_return_true:
       \else:
         \int_set:Nn \tex_endlinechar:D { -1 }
-        \etex_readline:D \g_@@_ior to \l_@@_internal_tl
+        \tex_readline:D \g_@@_ior to \l_@@_internal_tl
         \if_eof:w \g_@@_ior
           \cs_gset_eq:NN \@@_tmp:w \prg_return_true:
         \else:
@@ -900,7 +902,7 @@
   }
 \cs_new_protected:Npn \@@_write_now_loop:
   {
-    \etex_readline:D \g_@@_ior to \l_@@_internal_tl
+    \tex_readline:D \g_@@_ior to \l_@@_internal_tl
     \ior_if_eof:NF \g_@@_ior
       {
         \@@_collect:x
@@ -1053,7 +1055,7 @@
       \char_set_catcode_other:n { \tex_endlinechar:D }
       \tl_map_inline:nn { `(0123456789) }
         { \char_set_catcode_other:n {`##1} }
-      \etex_everyeof:D { `() \exp_not:N }
+      \tex_everyeof:D { `() \exp_not:N }
       \tl_set:Nx \l_@@_internal_tl
         {
           \exp_after:wN \@@_after_shipout_loop:ww
@@ -1088,14 +1090,14 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_shipout:w
   {
-    \int_gset_eq:NN \g_@@_group_level_int \etex_currentgrouplevel:D
+    \int_gset_eq:NN \g_@@_group_level_int \tex_currentgrouplevel:D
     \tex_afterassignment:D \@@_shipout_i:
     \tex_global:D \tex_setbox:D \g_@@_shipout_box
   }
 \cs_new_protected:Npn \@@_shipout_i:
   {
     \int_compare:nNnTF { \g_@@_group_level_int }
-                     = { \etex_currentgrouplevel:D }
+                     = { \tex_currentgrouplevel:D }
       { \@@_shipout_ii: }
       { \tex_aftergroup:D \@@_shipout_ii: }
   }
@@ -1142,7 +1144,7 @@
     \shipout
   }
   {
-    \str_if_eq_x:nnT
+    \str_if_eq:eeT
       { \cs_meaning:N #1 }
       { \token_to_str:N \shipout }
       { \@@_tmp:w #1 }
@@ -1181,7 +1183,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_close_all_at_end:nw #1#2 \@@@@end
   {
-    \int_compare:nNnTF {#1} > \c_zero
+    \int_compare:nNnTF {#1} > 0
       { #2 \@@_close_all_at_end:nw { #1 - 1 } }
       { \@@_close_all: #2 }
     \@@@@end
diff --git a/Master/texmf-dist/source/latex/morewrites/primargs.dtx b/Master/texmf-dist/source/latex/morewrites/primargs.dtx
index c911233ea97..5ba63d5e855 100644
--- a/Master/texmf-dist/source/latex/morewrites/primargs.dtx
+++ b/Master/texmf-dist/source/latex/morewrites/primargs.dtx
@@ -9,6 +9,8 @@
 %%
 %%    http://www.latex-project.org/lppl.txt
 %%
+%% This work has the LPPL maintenance status 'maintained'
+%% and the current maintainer is Bruno Le Floch.
 %% -----------------------------------------------------------------------
 %
 %<*driver>
@@ -23,7 +25,7 @@
 % \title{The \textsf{primargs} package: \\
 %   Parsing arguments of primitives}
 % \author{Bruno Le Floch}
-% \date{2018/04/04}
+% \date{2018/12/29}
 %
 % \maketitle
 % \tableofcontents
@@ -250,16 +252,16 @@
 %    \begin{macrocode}
 \RequirePackage {expl3} [2018/02/21]
 \ProvidesExplPackage
-  {primargs} {2018/04/04} {} {Parsing arguments of primitives}
+  {primargs} {2018/12/29} {} {Parsing arguments of primitives}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
 %<@@=primargs>
 %    \end{macrocode}
 %
-% \begin{function}{\__primargs_get_rhs:NnN, \__primargs_get_rhs:NoN}
+% \begin{function}{\@@_get_rhs:NnN, \@@_get_rhs:NoN}
 %   \begin{syntax}
-%     \cs{__primargs_get_rhs:NnN} \meta{register} \Arg{register rhs} \meta{function}
+%     \cs{@@_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
@@ -280,7 +282,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{variable}[int]{\g_@@_file_name_tl, \g_@@_file_name_level_tl}
+% \begin{variable}{\g_@@_file_name_tl, \g_@@_file_name_level_tl}
 %   Token list used to build a file name, one character at a time.
 %   Token list holding the level of nesting in quotes or braces.
 %    \begin{macrocode}
@@ -566,7 +568,7 @@
 % automatically assigned globally, and we revert it to its previous
 % value afterwards.
 %
-% \begin{macro}[int]{\@@_get_rhs:NnN, \@@_get_rhs:NoN}
+% \begin{macro}{\@@_get_rhs:NnN, \@@_get_rhs:NoN}
 %   The last two lines of this function are the key: assign to |#1|,
 %   then take control using \tn{afterassignment}.  After the assignment,
 %   we expand the value found, |\tex_the:D #1|, within a brace group,
@@ -694,7 +696,7 @@
 \cs_new_protected:Npn \@@_get_general_text_error:n #1
   {
     \exp_after:wN \group_end:
-    \etex_unexpanded:D \if_int_compare:w `{ = \c_zero \fi: #1 }
+    \tex_unexpanded:D \if_int_compare:w `{ = \c_zero_int \fi: #1 }
   }
 %    \end{macrocode}
 % \end{macro}
@@ -893,7 +895,7 @@
       }
     \cs_new_protected:Npn \@@_get_input_file_name_aux:N #1
       {
-        \exp_after:wN \str_if_eq_x:nnT
+        \exp_after:wN \str_if_eq:eeT
         \exp_after:wN { \token_to_str:N #1 } { \token_to_str:N \par }
           { \use_none:nnn }
         \tex_xdef:D \g_@@_file_name_tl
diff --git a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty
index 061ecec8656..38b7b39f436 100644
--- a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty
+++ b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty
@@ -18,11 +18,13 @@
 %%
 %%    http://www.latex-project.org/lppl.txt
 %%
+%% This work has the LPPL maintenance status 'maintained'
+%% and the current maintainer is Bruno Le Floch.
 %% -----------------------------------------------------------------------
 \RequirePackage {expl3} [2018/02/21]
-\RequirePackage {primargs} [2018/04/04]
+\RequirePackage {primargs} [2018/12/29]
 \ProvidesExplPackage
-  {morewrites} {2018/04/04} {} {Always room for a new write}
+  {morewrites} {2018/12/29} {} {Always room for a new write}
 \sys_if_engine_luatex:T
   {
     \cs_new_protected:Npn \morewritessetup #1 { }
@@ -78,7 +80,7 @@
         \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_true:
       \else:
         \int_set:Nn \tex_endlinechar:D { -1 }
-        \etex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl
+        \tex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl
         \if_eof:w \g__morewrites_ior
           \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_true:
         \else:
@@ -285,7 +287,7 @@
   }
 \cs_new_protected:Npn \__morewrites_write_now_loop:
   {
-    \etex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl
+    \tex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl
     \ior_if_eof:NF \g__morewrites_ior
       {
         \__morewrites_collect:x
@@ -358,7 +360,7 @@
       \char_set_catcode_other:n { \tex_endlinechar:D }
       \tl_map_inline:nn { `(0123456789) }
         { \char_set_catcode_other:n {`##1} }
-      \etex_everyeof:D { `() \exp_not:N }
+      \tex_everyeof:D { `() \exp_not:N }
       \tl_set:Nx \l__morewrites_internal_tl
         {
           \exp_after:wN \__morewrites_after_shipout_loop:ww
@@ -379,14 +381,14 @@
   }
 \cs_new_protected:Npn \__morewrites_shipout:w
   {
-    \int_gset_eq:NN \g__morewrites_group_level_int \etex_currentgrouplevel:D
+    \int_gset_eq:NN \g__morewrites_group_level_int \tex_currentgrouplevel:D
     \tex_afterassignment:D \__morewrites_shipout_i:
     \tex_global:D \tex_setbox:D \g__morewrites_shipout_box
   }
 \cs_new_protected:Npn \__morewrites_shipout_i:
   {
     \int_compare:nNnTF { \g__morewrites_group_level_int }
-                     = { \etex_currentgrouplevel:D }
+                     = { \tex_currentgrouplevel:D }
       { \__morewrites_shipout_ii: }
       { \tex_aftergroup:D \__morewrites_shipout_ii: }
   }
@@ -421,7 +423,7 @@
     \shipout
   }
   {
-    \str_if_eq_x:nnT
+    \str_if_eq:eeT
       { \cs_meaning:N #1 }
       { \token_to_str:N \shipout }
       { \__morewrites_tmp:w #1 }
@@ -442,7 +444,7 @@
   }
 \cs_new_protected:Npn \__morewrites_close_all_at_end:nw #1#2 \@@end
   {
-    \int_compare:nNnTF {#1} > \c_zero
+    \int_compare:nNnTF {#1} > 0
       { #2 \__morewrites_close_all_at_end:nw { #1 - 1 } }
       { \__morewrites_close_all: #2 }
     \@@end
diff --git a/Master/texmf-dist/tex/latex/morewrites/primargs.sty b/Master/texmf-dist/tex/latex/morewrites/primargs.sty
index 0c67d4b7b48..0211368429c 100644
--- a/Master/texmf-dist/tex/latex/morewrites/primargs.sty
+++ b/Master/texmf-dist/tex/latex/morewrites/primargs.sty
@@ -18,10 +18,12 @@
 %%
 %%    http://www.latex-project.org/lppl.txt
 %%
+%% This work has the LPPL maintenance status 'maintained'
+%% and the current maintainer is Bruno Le Floch.
 %% -----------------------------------------------------------------------
 \RequirePackage {expl3} [2018/02/21]
 \ProvidesExplPackage
-  {primargs} {2018/04/04} {} {Parsing arguments of primitives}
+  {primargs} {2018/12/29} {} {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
@@ -217,7 +219,7 @@
 \cs_new_protected:Npn \__primargs_get_general_text_error:n #1
   {
     \exp_after:wN \group_end:
-    \etex_unexpanded:D \if_int_compare:w `{ = \c_zero \fi: #1 }
+    \tex_unexpanded:D \if_int_compare:w `{ = \c_zero_int \fi: #1 }
   }
 \cs_new_protected:Npn \primargs_get_file_name:N #1
   {
@@ -331,7 +333,7 @@
       }
     \cs_new_protected:Npn \__primargs_get_input_file_name_aux:N #1
       {
-        \exp_after:wN \str_if_eq_x:nnT
+        \exp_after:wN \str_if_eq:eeT
         \exp_after:wN { \token_to_str:N #1 } { \token_to_str:N \par }
           { \use_none:nnn }
         \tex_xdef:D \g__primargs_file_name_tl