From 428910a342287d8f96d2e4f22ec49d8f5f63a31f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 29 Dec 2018 22:51:03 +0000 Subject: morewrites (29dec18) git-svn-id: svn://tug.org/texlive/trunk@49531 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/morewrites/morewrites.sty | 20 +++++++++++--------- Master/texmf-dist/tex/latex/morewrites/primargs.sty | 8 +++++--- 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/morewrites') 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 -- cgit v1.2.3