diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3io.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3io.sty | 45 |
1 files changed, 9 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty index 4073a35bfa8..c074dbf0ea2 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3io.dtx 2896 2011-10-09 20:36:50Z joseph $ +\GetIdInfo$Id: l3io.dtx 3005 2011-11-25 13:19:47Z bruno $ {L3 Experimental input-output operations} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -229,41 +229,16 @@ \cs_generate_variant:Nn \ior_close:N { c } \cs_generate_variant:Nn \iow_close:N { c } \cs_new_protected_nopar:Npn \ior_list_streams: - { - \prop_if_empty:NTF \g_ior_streams_prop - { - \iow_term:x { No~input~streams~are~open } - \tl_show:n { } - } - { - \iow_term:x { The~following~input~streams~are~in~use: } - \tl_set:Nx \l_prop_show_tl - { \prop_map_function:NN \g_ior_streams_prop \ior_show_aux:nn } - \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN - { \exp_after:wN \prop_show_aux:w \l_prop_show_tl } - } - } -\cs_new:Npn \ior_show_aux:nn #1#2 - { - \iow_newline: > \c_space_tl \c_space_tl - #1 \c_space_tl \c_space_tl => \c_space_tl \c_space_tl \exp_not:n {#2} - } + { \ior_list_streams_aux:Nn \g_ior_streams_prop { ior } } \cs_new_protected_nopar:Npn \iow_list_streams: + { \ior_list_streams_aux:Nn \g_iow_streams_prop { iow } } +\cs_new_protected:Npn \ior_list_streams_aux:Nn #1#2 { - \prop_if_empty:NTF \g_iow_streams_prop - { - \iow_term:x { No~output~streams~are~open } - \tl_show:n { } - } - { - \iow_term:x { The~following~output~streams~are~in~use: } - \tl_set:Nx \l_prop_show_tl - { \prop_map_function:NN \g_iow_streams_prop \iow_show_aux:nn } - \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN - { \exp_after:wN \prop_show_aux:w \l_prop_show_tl } - } + \msg_aux_use:nn { LaTeX / #2 } + { \prop_if_empty:NTF #1 { show-no-stream } { show-open-streams } } + \msg_aux_show:x + { \prop_map_function:NN #1 \msg_aux_show_unbraced:nn } } -\cs_new_eq:NN \iow_show_aux:nn \ior_show_aux:nn \msg_kernel_new:nnnn { iow } { streams-exhausted } { Output~streams~exhausted } { @@ -421,9 +396,7 @@ } \cs_new_protected_nopar:Npn \iow_wrap_special:w #1 ~ #2 ~ #3 ~ % { - \cs_if_exist:cTF { iow_wrap_#1: } - { \use:c { iow_wrap_#1: } } - { \msg_expandable_error:n {#1} } + \use:c { iow_wrap_#1: } \str_if_eq:xxTF { #2~#3 } { ~ \c_iow_wrap_marker_tl } { \iow_wrap_special:w } { \iow_wrap_loop:w #2 ~ #3 ~ } |