From 5890c57826c2128580cec1fc13315e5ef36ad39d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 8 Dec 2012 17:15:53 +0000 Subject: morewrites (5dec12) git-svn-id: svn://tug.org/texlive/trunk@28470 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/morewrites/morewrites.dtx | 25 +++++++++++++++------- .../source/latex/morewrites/primargs.dtx | 6 +++--- 2 files changed, 20 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source/latex/morewrites') diff --git a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx index cb1f7da2b54..ba398da6481 100644 --- a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx +++ b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx @@ -26,9 +26,9 @@ % % \title{The \textsf{morewrites} package: \\ % Always room for a new \cs{write}\thanks{This -% file has version number v0.2c, last revised 2012/08/24.}} +% file has version number v0.2d, last revised 2012/12/05.}} % \author{Bruno Le Floch} -% \date{2012/08/24} +% \date{2012/12/05} % % \maketitle % \tableofcontents @@ -96,7 +96,7 @@ \RequirePackage {expl3} [2012/08/14] \RequirePackage {primargs} [2012/08/24] \ProvidesExplPackage - {morewrites} {2012/08/24} {0.2c} {Always room for a new write} + {morewrites} {2012/12/05} {0.2d} {Always room for a new write} % \end{macrocode} % % \begin{macrocode} @@ -338,8 +338,9 @@ % % \subsubsection{What follows \tn{immediate}} % -% \begin{macro}[aux]{\@@_immediate:w} -% \begin{macro}[aux]{\@@_immediate_ii:, \@@_immediate_iii:N} +% \begin{macro}[aux, updated = 2012-12-05]{\@@_immediate:w} +% \begin{macro}[aux, updated = 2012-12-05]{\@@_immediate_ii:} +% \begin{macro}[aux]{\@@_immediate_iii:N} % \begin{macro}[aux]{\@@_immediate_iv:NN} % \begin{macro}[aux, EXP]{\@@_immediate_v:w} % This is a little bit subtle: \TeX{}'s \tn{immediate} primitive @@ -350,14 +351,19 @@ % themselves, but rather for a recognizable marker, \cs{s_@@}, equal % to \tn{relax}. If present, replace |morewrites| by % |morewrites_immediate| in the csname of the second token after it -% (it turns out that this is the correct structure). +% (it turns out that this is the correct structure). If absent, what +% follows may be a command that should not appear after +% \tn{immediate}, but it may also be a non-\TeX\ primitive such as +% \tn{pdfobj} that the \pkg{morewrite} does not know about; hence we +% must still call the primitive \tn{immediate}. % \begin{macrocode} \cs_new_protected_nopar:Npn \@@_immediate:w { \primargs_read_x_token:N \@@_immediate_ii: } \cs_new_protected_nopar:Npn \@@_immediate_ii: { - \token_if_eq_meaning:NNT \g_primargs_token \s_@@ + \token_if_eq_meaning:NNTF \g_primargs_token \s_@@ { \@@_immediate_iii:N } + { \@@_tex_immediate:w } } \cs_new_protected:Npn \@@_immediate_iii:N #1 { @@ -383,6 +389,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \subsubsection{Immediate closeout} % @@ -888,7 +895,8 @@ % % \subsection{Redefining the ``normal'' control sequences} % -% \begin{macro}[aux]{\immediate, \openout, \write, \closeout, \newwrite} +% \begin{macro}[aux, updated = 2012-12-05]{\immediate} +% \begin{macro}[aux]{\openout, \write, \closeout, \newwrite} % \tn{shipout} has been redefined earlier. % \begin{macrocode} \cs_gset_eq:NN \immediate \@@_immediate:w @@ -898,6 +906,7 @@ \cs_gset_eq:NN \newwrite \@@_newwrite:N % \end{macrocode} % \end{macro} +% \end{macro} % % % diff --git a/Master/texmf-dist/source/latex/morewrites/primargs.dtx b/Master/texmf-dist/source/latex/morewrites/primargs.dtx index cff44ae4fb3..d015d9366d6 100644 --- a/Master/texmf-dist/source/latex/morewrites/primargs.dtx +++ b/Master/texmf-dist/source/latex/morewrites/primargs.dtx @@ -22,9 +22,9 @@ % % \title{The \textsf{primargs} package: \\ % Parsing arguments of primitives\thanks{This -% file has version number v0.2c, last revised 2012/08/24.}} +% file has version number v0.2d, last revised 2012/12/05.}} % \author{Bruno Le Floch} -% \date{2012/08/24} +% \date{2012/12/05} % % \maketitle % \tableofcontents @@ -150,7 +150,7 @@ % \begin{macrocode} \RequirePackage {expl3} [2012/08/14] \ProvidesExplPackage - {primargs} {2012/08/24} {0.2c} {Parsing arguments of primitives} + {primargs} {2012/12/05} {0.2d} {Parsing arguments of primitives} % \end{macrocode} % % \begin{macrocode} -- cgit v1.2.3