1 files changed, 32 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty
index d41ae01318f..4e265aef03a 100644
--- a/Master/texmf-dist/tex/latex/collectbox/collectbox.sty
+++ b/Master/texmf-dist/tex/latex/collectbox/collectbox.sty
@@ -4,29 +4,44 @@
 %%
 %% The original source files were:
 %%
-%% collectbox.dtx  (with options: `collectbox')
+%% collectbox.dtx  (with options: `collectbox.sty')
 %% 
-%% Copyright (C) 2011 by Martin Scharrer <martin@scharrer-online.de>
+%% IMPORTANT NOTICE:
 %% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
+%% For the copyright see the source file.
 %% 
-%%    http://www.latex-project.org/lppl.txt
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from collectbox.sty.
 %% 
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
+%% For distribution of the original source see the terms
+%% for copying and modification in the file collectbox.dtx.
 %% 
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% Copyright (C) 2012 by Martin Scharrer <martin@scharrer-online.de>
+%% --------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
 %% This work has the LPPL maintenance status `maintained'.
-%% 
+%%
 %% The Current Maintainer of this work is Martin Scharrer.
-%% 
-%% This work consists of the files collectbox.dtx, collectbox.ins
-%% and the derived file collectbox.sty.
-%% 
+%%
+%% This work consists of the files collectbox.dtx and collectbox.ins
+%% and the derived filebase collectbox.sty.
+%%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{collectbox}[2011/08/23 v0.4 Collect macro arguments as boxes]
+\ProvidesPackage{collectbox}[%
+    2012/05/13
+    v0.4a
+    Collect macro arguments as boxes]
 \newsavebox\collectedbox
 \newcommand*\collectbox{%
     \@ifstar
@@ -186,7 +201,7 @@
     \fi
 }
 \def\@collectboxisenv#1{%
-    \noindent
+    \collectbox@noindent
     \collectboxenvtrue
     \edef\@currenvir{\@currenvir\noexpand\empty}%
     \let\collectbox@bgroup\collectbox@env@bgroup
@@ -197,6 +212,7 @@
     \fi
 }
 \newif\ifcollectboxenv
+\let\collectbox@noindent\noindent
 \def\collectbox@env@endcode{\ifhmode\unskip\fi}%
 \def\collectbox@envend{\collectboxenvend}%
 \def\collectboxenvend{%