From 76955d84451b6ee69a2420d86c0a2c2eeea06d7d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 24 Aug 2012 23:40:06 +0000 Subject: morewrites (24aug12) git-svn-id: svn://tug.org/texlive/trunk@27516 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/morewrites/morewrites.sty | 27 +++++++++++----------- .../texmf-dist/tex/latex/morewrites/primargs.sty | 7 +++--- 2 files changed, 17 insertions(+), 17 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 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 ) diff --git a/Master/texmf-dist/tex/latex/morewrites/primargs.sty b/Master/texmf-dist/tex/latex/morewrites/primargs.sty index 81ed7e6c153..34d9f76fcfb 100644 --- a/Master/texmf-dist/tex/latex/morewrites/primargs.sty +++ b/Master/texmf-dist/tex/latex/morewrites/primargs.sty @@ -19,10 +19,9 @@ %% http://www.latex-project.org/lppl.txt %% %% ----------------------------------------------------------------------- -\RequirePackage{l3names} +\RequirePackage {expl3} [2012/08/14] \ProvidesExplPackage - {primargs}{2012/07/10}{0.1}{Parsing~arguments~of~primitives} -\RequirePackage{expl3} + {primargs} {2012/08/24} {0.2c} {Parsing arguments of primitives} \cs_new_protected_nopar:Npn \g__primargs_code_tl { } \cs_new_protected_nopar:Npn \__primargs_no_afterassignment: { \tex_afterassignment:D \tex_relax:D } @@ -151,6 +150,8 @@ \msg_warning:nn { primargs } { get-mudimen } \primargs_get_muglue:N } +\msg_new:nnn { primargs } { get-mudimen } + { The~\iow_char:N\\primargs_get_mudimen:N~function~is~buggy. } \cs_new_protected_nopar:Npn \primargs_get_muglue:N { \__primargs_get_rhs:NoN \tex_thinmuskip:D -- cgit v1.2.3