morewrites (10sep11)

git-svn-id: svn://tug.org/texlive/trunk@23923 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 30 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf b/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf
index 3bea8a5edd4..10377dadd06 100644
--- a/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf
+++ b/Master/texmf-dist/doc/latex/morewrites/morewrites.pdf
diff --git a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx
index 846186617df..cc8d2d23121 100644
--- a/Master/texmf-dist/source/latex/morewrites/morewrites.dtx
+++ b/Master/texmf-dist/source/latex/morewrites/morewrites.dtx
@@ -13,7 +13,7 @@
 %
 %<*driver|package>
 \RequirePackage{l3names}
-\GetIdInfo$Id: morewrites.dtx 0.0 2011-07-09 00:00:00Z bruno $
+\GetIdInfo$Id: morewrites.dtx 0.1 2011-09-09 00:00:00Z bruno $
        {Always room for a new write}%
 %</driver|package>
 %<*driver>
@@ -36,7 +36,7 @@
 %
 % \maketitle
 % \tableofcontents
-% 
+%
 % \begin{documentation}
 %
 %   \section{\pkg{morewrites} documentation}
@@ -48,10 +48,10 @@
 %   so that they are less greedy on resources, but that is often
 %   unpractical for the end-user. Instead, \pkg{morewrites} hooks
 %   at the lowest level (\TeX{} primitives). If I did my job
-%   correctly, users simply need to add the line
-%   |\usepackage{morewrites}| somewhere near the beginning of the
+%   correctly, you simply need to add the line
+%   |\usepackage{morewrites}| somewhere near the beginning of your
 %   \LaTeX{} file, and the \enquote{no room for a new \cs{write}}
-%   error should be gone.
+%   error should vanish.
 %
 %   As this is a rather new package, it has not been tested very
 %   thoroughly yet. I thus encourage you to check that references
@@ -61,6 +61,11 @@
 %   \url{tex.stackexchange.com} question and answers website,
 %   or the \url{comp.text.tex} newsgroup.
 %
+%   This package loads the \pkg{expl3} package, hence the
+%   \pkg{l3kernel} bundle needs to be up to date. If Heiko
+%   Oberdiek's package %^^A \pkg{atveryend}
+%   \pkg{atbegshi} is available, it will be used.
+%
 %   \section{Known deficiencies}
 %
 %   Some distributions of \TeX{} allow a quoted syntax for file
@@ -711,14 +716,14 @@
 \IfFileExists{atbegshi.sty}
   {
     \RequirePackage{atbegshi}
-    \tl_replace_in:Nnn \AtBegShi@Output
+    \tl_replace_once:Nnn \AtBegShi@Output
       { \AtBegShi@OrgShipout \box \AtBeginShipoutBox }
       {
         \mw_before_shipout:
         \AtBegShi@OrgShipout \box \AtBeginShipoutBox
         \mw_after_shipout:
       }
-    \tl_replace_in:Nnn \AtBegShi@Output
+    \tl_replace_once:Nnn \AtBegShi@Output
       { \AtBeginShipoutOriginalShipout \box \AtBeginShipoutBox }
       {
         \mw_before_shipout:
@@ -779,12 +784,12 @@
 %   recursively, just in case some other code adds things there.
 %   If \pkg{atveryend} is available, we use it instead.
 %    \begin{macrocode}
-\IfFileExists{atveryend.sty} { \use_i:nn } { \use_ii:nn }
-  {
-    \RequirePackage {atveryend}
-    \AtVeryVeryEnd { \mw_close_all: }
-  }
-  {
+ % \IfFileExists{atveryend.sty} { \use_i:nn } { \use_ii:nn }
+ %   {
+ %     \RequirePackage {atveryend} [2011/06/29]
+ %     \AtVeryVeryEnd { \mw_close_all: }
+ %   }
+ %   {
     \cs_new_protected:Npn \mw_put_at_end:Nw #1 #2 \@@end
       {
         \tl_if_empty:nTF {#2}
@@ -792,7 +797,7 @@
           { #2 \mw_put_at_end:Nw #1 \@@end }
       }
     \AtEndDocument { \mw_put_at_end:Nw \mw_close_all: }
-  }
+  % }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -831,7 +836,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%</package> 
+%</package>
 %
 % \end{implementation}
 %
diff --git a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty
index eaf2c1b4bcb..202c539dc7a 100644
--- a/Master/texmf-dist/tex/latex/morewrites/morewrites.sty
+++ b/Master/texmf-dist/tex/latex/morewrites/morewrites.sty
@@ -20,7 +20,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: morewrites.dtx 0.0 2011-07-09 00:00:00Z bruno $
+\GetIdInfo$Id: morewrites.dtx 0.1 2011-09-09 00:00:00Z bruno $
        {Always room for a new write}%
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -341,14 +341,14 @@
 \IfFileExists{atbegshi.sty}
   {
     \RequirePackage{atbegshi}
-    \tl_replace_in:Nnn \AtBegShi@Output
+    \tl_replace_once:Nnn \AtBegShi@Output
       { \AtBegShi@OrgShipout \box \AtBeginShipoutBox }
       {
         \mw_before_shipout:
         \AtBegShi@OrgShipout \box \AtBeginShipoutBox
         \mw_after_shipout:
       }
-    \tl_replace_in:Nnn \AtBegShi@Output
+    \tl_replace_once:Nnn \AtBegShi@Output
       { \AtBeginShipoutOriginalShipout \box \AtBeginShipoutBox }
       {
         \mw_before_shipout:
@@ -392,12 +392,12 @@
       }
     \prop_gclear:N \g_mw_writes_prop
   }
-\IfFileExists{atveryend.sty} { \use_i:nn } { \use_ii:nn }
-  {
-    \RequirePackage {atveryend}
-    \AtVeryVeryEnd { \mw_close_all: }
-  }
-  {
+ % \IfFileExists{atveryend.sty} { \use_i:nn } { \use_ii:nn }
+ %   {
+ %     \RequirePackage {atveryend} [2011/06/29]
+ %     \AtVeryVeryEnd { \mw_close_all: }
+ %   }
+ %   {
     \cs_new_protected:Npn \mw_put_at_end:Nw #1 #2 \@@end
       {
         \tl_if_empty:nTF {#2}
@@ -405,7 +405,7 @@
           { #2 \mw_put_at_end:Nw #1 \@@end }
       }
     \AtEndDocument { \mw_put_at_end:Nw \mw_close_all: }
-  }
+  % }
 \countdef \mw_write_int 17 \scan_stop:
 \cs_new:Npn \mw_newwrite:N #1
   {