diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/morewrites/morewrites.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/morewrites/morewrites.sty | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty index fe8cbf1ee6e..df1f34cd584 100644 --- a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty +++ b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty @@ -19,10 +19,11 @@ %% http://www.latex-project.org/lppl.txt %% %% ----------------------------------------------------------------------- -\RequirePackage{l3names} +\RequirePackage {expl3} [2012/08/14] +\RequirePackage {primargs} [2012/08/24] \ProvidesExplPackage - {morewrites} {2012/07/10} {0.2} {Always room for a new write} -\RequirePackage{expl3, primargs} + {morewrites} {2012/08/24} {0.2c} {Always room for a new write} +\cs_generate_variant:Nn \prop_gpop:NnNT { NV } \cs_new_eq:NN \__morewrites_tex_immediate:w \tex_immediate:D \cs_new_eq:NN \__morewrites_tex_openout:w \tex_openout:D \cs_new_eq:NN \__morewrites_tex_write:w \tex_write:D @@ -47,7 +48,7 @@ \tex_aftergroup:D #1 \primargs_remove_equals:N \__morewrites_parse_file_name: } -\cs_new_protected:Npn \__morewrites_parse_file_name: +\cs_new_protected_nopar:Npn \__morewrites_parse_file_name: { \primargs_get_file_name:N \group_end: } \cs_new_protected_nopar:Npn \__morewrites_immediate:w { \primargs_read_x_token:N \__morewrites_immediate_ii: } @@ -84,8 +85,7 @@ } \cs_new_protected_nopar:Npn \__morewrites_immediate_closeout_aux: { - \exp_args:NNV \prop_pop:NnNT \g__morewrites_iow_prop - \g__morewrites_stream_int \l__morewrites_internal_tl + \prop_gpop:NVNT \g__morewrites_iow_prop \g__morewrites_stream_int \l__morewrites_internal_tl { \__morewrites_immediate_write_and_close:nn { \g__morewrites_stream_int } { \l__morewrites_internal_tl } @@ -124,7 +124,7 @@ } \cs_new_protected_nopar:Npn \__morewrites_immediate_write_aux:n { - \prop_if_in:NVTF \g__morewrites_iow_prop \g__morewrites_stream_int + \prop_get:NVNTF \g__morewrites_iow_prop \g__morewrites_stream_int \l__morewrites_internal_tl { \__morewrites_immediate_write_open:n } { \__morewrites_immediate_write_closed:n } } @@ -220,7 +220,6 @@ \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_iow \g__morewrites_tmp_file_tl \scan_stop: } -%% ^^A todo: \shipout{\immediate\write4{}} => bug. \cs_new_protected_nopar:Npn \__morewrites_after_shipout: { \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_iow @@ -230,13 +229,13 @@ \tl_map_inline:nn { `(0123456789) } { \char_set_catcode_other:n {`##1} } \etex_everyeof:D { `() \exp_not:N } - \exp_args:NNx + \tl_gset:Nx \g__morewrites_internal_tl + { + \exp_after:wN \__morewrites_after_shipout_loop:ww + \tex_input:D \g__morewrites_tmp_file_tl \c_space_tl + } \group_end: - \tl_map_inline:nn - { - \exp_after:wN \__morewrites_after_shipout_loop:ww - \tex_input:D \g__morewrites_tmp_file_tl \c_space_tl %^^A bug? - } + \tl_map_inline:Nn \g__morewrites_internal_tl { \tl_use:c { c__morewrites_late_write_ ##1 _tl } } } \cs_new:Npn \__morewrites_after_shipout_loop:ww #1 `( #2 ) |