summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-16 23:10:20 +0000
committerKarl Berry <karl@freefriends.org>2012-05-16 23:10:20 +0000
commit387ff75e853f31b3043ab9804b491055249347b4 (patch)
tree7da988e11216f905861fd1610d3c833dcb0ea8ba /Master
parent5b130c1b3fb6521ac46fd1693c41b50073e53b3c (diff)
collectbox 0.4a (16may12)
git-svn-id: svn://tug.org/texlive/trunk@26453 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/collectbox/collectbox.pdfbin174724 -> 268986 bytes
-rw-r--r--Master/texmf-dist/source/latex/collectbox/collectbox.dtx100
-rw-r--r--Master/texmf-dist/source/latex/collectbox/collectbox.ins46
-rw-r--r--Master/texmf-dist/tex/latex/collectbox/collectbox.sty48
4 files changed, 92 insertions, 102 deletions
diff --git a/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf b/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf
index 6a3529daf88..fadfd31ff90 100644
--- a/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf
+++ b/Master/texmf-dist/doc/latex/collectbox/collectbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/collectbox/collectbox.dtx b/Master/texmf-dist/source/latex/collectbox/collectbox.dtx
index ce34f8ef45b..1b239ba08d0 100644
--- a/Master/texmf-dist/source/latex/collectbox/collectbox.dtx
+++ b/Master/texmf-dist/source/latex/collectbox/collectbox.dtx
@@ -1,29 +1,38 @@
% \iffalse meta-comment
-%
-% Copyright (C) 2011 by Martin Scharrer <martin@scharer-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 and collectbox.ins
-% and the derived filebase collectbox.sty.
-%
+%<=*COPYRIGHT>
+%% 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 and collectbox.ins
+%% and the derived filebase collectbox.sty.
+%%
+%<=/COPYRIGHT>
% \fi
%
% \iffalse
%<*driver>
-\ProvidesFile{collectbox.dtx}[2011/08/23 v0.4 DTX File of collectbox]
+\ProvidesFile{collectbox.dtx}[%
+%<=*DATE>
+ 2012/05/13
+%<=/DATE>
+%<=*VERSION>
+ v0.4a
+%<=/VERSION>
+ DTX File of collectbox]
\documentclass{ydoc}
-\usepackage{collectbox}[2011/08/23]
+\GetFileInfo{collectbox.dtx}
+\usepackage{collectbox}[\filedate]
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -63,16 +72,15 @@
% \changes{v0.3a}{2011/08/11}{Fixed issue with collectbox macros in the end-code of a collectbox environment.}
% \changes{v0.4}{2011/08/23}{In environment-mode the begin and end are now placed directly around the content to allow tabular-like environments.
% Added support for tabular-like environments in macro-mode.}
+% \changes{v0.4a}{2012/05/13}{Made use of \cs{noindent} by the environment version optional.}
%
%
% \DoNotIndex{\newcommand,\newenvironment}
%
-% \providecommand*{\url}{\texttt}
% \GetFileInfo{collectbox.dtx}
-% \title{The \textsf{collectbox} package}
-% \author{Martin Scharrer\\ \url{martin@scharrer-online.de}}
-% \date{\fileversion~from \filedate}
-%
+% \author{Martin Scharrer}
+% \email{martin@scharrer-online.de}
+% \repository{https://bitbucket.org/martin_scharrer/collectbox}
% \maketitle
%
% \begin{abstract}
@@ -84,13 +92,11 @@
% and \Macro\egroup are supported. This allows to split the begin and end over different macros or to place them
% in the begin and end code of an environment.
% The provided macros are mainly intended to be used inside other macros or environments.
-%
-% {\bfseries\color{red}Disclaimer: This is an beta release of this package and the code might still change in future releases.}
% \end{abstract}
%
% \section{Quick overview}
% The following macros are provided for users (document authors) and \LaTeX\ package authors/programmers and described in the following sections.
-% The \MacroArgs* and \MacroArgs[<\ldots>] arguments are as always optional. The \MacroArgs{<box content>} can also be written as
+% The \MacroArgs* and \MacroArgs[<\ldots>] arguments are as always optional. The \MacroArgs{<box content>} can also be written as
% \Macro\bgroup<box content>\AlsoMacro\egroup and be split across macro boundaries.
%
% \begingroup
@@ -110,7 +116,7 @@
% It should be compatible with all versions of \LaTeX (DVI-\LaTeX, pdf\LaTeX, Xe\LaTeX\ and Lua\LaTeX).
% Colored content will be correctly handled.
%
-% This package should be (soon) part of the standard distributions TeXLive and MikTeX and can be installed over the
+% This package should be (soon) part of the standard distributions TeXLive and MikTeX and can be installed over the
% provided package manager (i.e.\ with TeXLive: |tlmgr install collectcell|).
% This package can be also manually unpacked from |collectbox.dtx| by compiling the file |collectbox.ins| with \LaTeX\ or \TeX.
% This documentation can be created by compiling |collectbox.dtx| using pdf\LaTeX\ in DVI or PDF mode.
@@ -139,7 +145,7 @@
%
% \DescribeMacro\collectbox*{<code>}{<box content>}
% \DescribeMacro\collectbox*{<code>}\AlsoMacro\bgroup<box content>\AlsoMacro\egroup
-% Because very often the \Macro\BOXCONTENT is simply fed as argument to a macro at the end of the \MacroArgs<code> a star version exists which adds \MacroArgs{\AlsoMacro\BOXCONTENT} automatically
+% Because very often the \Macro\BOXCONTENT is simply fed as argument to a macro at the end of the \MacroArgs<code> a star version exists which adds \MacroArgs{\AlsoMacro\BOXCONTENT} automatically
% to the end of the code.
%
% An above example can be therefore simplified as:
@@ -174,7 +180,7 @@
%
% \DescribeMacro\collectedbox
% This macro represents the box register defined by \Macro\newsavebox\relax which holds the collected box.
-% It can be used with the \LaTeX's macro \Macro\usebox{<box register>} or with plain\TeX\
+% It can be used with the \LaTeX's macro \Macro\usebox{<box register>} or with plain\TeX\
% macros like \Macro\box, \Macro\copy, \Macro\unhbox or \Macro\unhcopy.
%
% \DescribeMacro\BOXCONTENT
@@ -197,13 +203,13 @@
% and also none of the above auxiliary macros for the box dimensions and content can be used. The collected box can be typeset using \Macro\usebox{<box register>}
% and its width, height and depth dimensions can be accessed using the \TeX\ primitives \Macro\wd<box register>, \Macro\ht<box register>, \Macro\dp<box register>.
%
-% Appropriate grouping must be added manually if the overall code should be kept local. Proper places to open and close the group is somewhere before
+% Appropriate grouping must be added manually if the overall code should be kept local. Proper places to open and close the group is somewhere before
% the \Macro\collectboxto macro and in the \meta{code} after the box was used, respectively.
% The box register must be declared beforehand using \Macro\newsavebox\relax (\LaTeX) or \Macro\newbox (\TeX).
% The provided box register \Macro\collectedbox can be used here but will be overwritten by further usages of most of the macros of this package.
% The \LaTeX\ code also provides \Macro\@tempboxa for temporary usages.
%
-% This macro can be used to create macros which collect more than one argument as box. For this two box registers are required and the \meta{code} of the
+% This macro can be used to create macros which collect more than one argument as box. For this two box registers are required and the \meta{code} of the
% first \Macro\collectboxto usage must call it second time. The second \meta{code} then typesets the two boxes.
%
% \subsection{Support for environments}
@@ -235,7 +241,7 @@
% This macro is the internal form of \Macro\collectbox with the optional arguments replaced by mandatory ones.
% The \Macro\collectbox macro itself uses it after checking for and reading the optional arguments.
% If this macro is to be used in other macros this overhead can be avoided by using the internal form directly.
-% Not used optional arguments can be simply kept empty. The star version is not supported but can be easily substituted by
+% Not used optional arguments can be simply kept empty. The star version is not supported but can be easily substituted by
% manually placing the \MacroArgs{\Macro\BOXCONTENT} at the end of \MacroArgs<code>.
%
% The above example can therefore be written in the faster processed form:
@@ -278,11 +284,18 @@
% \section{Implementation}
%
% \iffalse
-%<*collectbox>
+%<*collectbox.sty>
% \fi
% \begin{macrocode}
+%<!COPYRIGHT>
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{collectbox}[2011/08/23 v0.4 Collect macro arguments as boxes]
+\ProvidesPackage{collectbox}[%
+%<!DATE>
+%<!VERSION>
+%<*DRIVER>
+ 2099/01/01 develop
+%</DRIVER>
+ Collect macro arguments as boxes]
% \end{macrocode}
%
% \begin{macro}{\collectedbox}
@@ -342,7 +355,7 @@
% \end{macro}
%
% \begin{macro}{\collectbox@mode}
-%
+%
% \begin{macrocode}
\let\collectbox@mode\leavevmode
% \end{macrocode}
@@ -350,7 +363,7 @@
%
% \begin{macro}{\collectbox@}
% The box is saved using |\setbox|. Color is supported by using |\collectbox@setgroup|.
-% A brace group is then opened using |\bgroup| which will replace the opening brace of the
+% A brace group is then opened using |\bgroup| which will replace the opening brace of the
% ``argument''. The end code is installed in this group using |\aftergroup|.
% The opening brace written by the user is then removed by assigning it as token to a dummy variable.
% If no |{| or |\bgroup| follows the next token is taken as sole content.
@@ -471,7 +484,7 @@
%
% \begin{macro}{\collectbox@end}
% The color group is first closed, followed by the closing brace of the |\setbox| command.
-% The user dimension macros are then defined.
+% The user dimension macros are then defined.
% Direct after this code the users code is processed and concluded with a |\endgroup|.
% \begin{macrocode}
\def\collectbox@end{%
@@ -625,7 +638,7 @@
% If so the |bgroup| eating macro is redefined.
% A suitable end-macro is provided if non exists. All of this is done inside
% a group to keep thing local.
-% The \Macro\@currenvir macro is redefined to contain \Macro\empty so that
+% The \Macro\@currenvir macro is redefined to contain \Macro\empty so that
% macros with the same name can be used inside the environment without collisions.
% This requires an extra internal group so that this change is reverted before the
% \Macro\end macro.
@@ -639,7 +652,7 @@
\fi
}
\def\@collectboxisenv#1{%
- \noindent
+ \collectbox@noindent
\collectboxenvtrue
\edef\@currenvir{\@currenvir\noexpand\empty}%
\let\collectbox@bgroup\collectbox@env@bgroup
@@ -650,6 +663,7 @@
\fi
}
\newif\ifcollectboxenv
+\let\collectbox@noindent\noindent
% \end{macrocode}
% \end{macro}
%
@@ -872,8 +886,8 @@
% \end{macro}
%
% \iffalse
-%</collectbox>
+%</collectbox.sty>
% \fi
%
% \Finale
-\endinput
+% \endinput
diff --git a/Master/texmf-dist/source/latex/collectbox/collectbox.ins b/Master/texmf-dist/source/latex/collectbox/collectbox.ins
index 500163b4af6..c2e2d2ebffd 100644
--- a/Master/texmf-dist/source/latex/collectbox/collectbox.ins
+++ b/Master/texmf-dist/source/latex/collectbox/collectbox.ins
@@ -1,49 +1,9 @@
-%% $Id: collectbox.ins 2095 2011-01-28 16:16:43Z martin $
-\input docstrip.tex
-\preamble
-
-Copyright (C) 2011 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.3c
-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.3c or later is part of all distributions of LaTeX
-version 2008/05/04 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.
-
-\endpreamble
+\input ydocstrip.tex
\keepsilent
+\askforoverwritefalse
\generate{%
- \file{collectbox.sty}{\from{collectbox.dtx}{collectbox}}%
+ \file{collectbox.sty}{\from{collectbox.dtx}{collectbox.sty}}%
}
-
-\obeyspaces
-\Msg{*************************************************************}
-\Msg{* *}
-\Msg{* To finish the installation you have to move the following *}
-\Msg{* file into a directory searched by TeX: *}
-\Msg{* *}
-\Msg{* collectbox.sty *}
-\Msg{* *}
-\Msg{* To produce the documentation run the file collectbox.dtx *}
-\Msg{* through LaTeX. *}
-\Msg{* *}
-\Msg{* Happy TeXing! *}
-\Msg{* *}
-\Msg{*************************************************************}
-
\endbatchfile
-
%% vim: ft=tex
-
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{%