summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-02-18 00:19:59 +0000
committerKarl Berry <karl@freefriends.org>2011-02-18 00:19:59 +0000
commit29ad02fd4322ffef1392ab34657c49378ac2f1aa (patch)
tree5de5850e4df059a2604dd5d47a9be2d58dc83262
parentaa91b4505c83e1c64bfa716a2f63cd74a1991b59 (diff)
boxhandler (16feb11)
git-svn-id: svn://tug.org/texlive/trunk@21451 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/boxhandler/boxhandler.pdfbin238178 -> 348553 bytes
-rw-r--r--Master/texmf-dist/source/latex/boxhandler/boxhandler.dtx29
-rw-r--r--Master/texmf-dist/tex/latex/boxhandler/boxhandler.sty18
3 files changed, 24 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/boxhandler/boxhandler.pdf b/Master/texmf-dist/doc/latex/boxhandler/boxhandler.pdf
index def9585ce2b..418141b267e 100644
--- a/Master/texmf-dist/doc/latex/boxhandler/boxhandler.pdf
+++ b/Master/texmf-dist/doc/latex/boxhandler/boxhandler.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/boxhandler/boxhandler.dtx b/Master/texmf-dist/source/latex/boxhandler/boxhandler.dtx
index 644aab9c6e1..48aa1324028 100644
--- a/Master/texmf-dist/source/latex/boxhandler/boxhandler.dtx
+++ b/Master/texmf-dist/source/latex/boxhandler/boxhandler.dtx
@@ -10,7 +10,7 @@
%% arlcaptions.sty.
%%
%<package>\ProvidesPackage{boxhandler}
-%<package>[2008/08/16 v1.21
+%<package>[2011/02/16 v1.22
%<package> Tools for Optimizing Captions, Presentation, and
%<package> Placement of Tables and Figures]
%<package>\NeedsTeXFormat{LaTeX2e}
@@ -33,6 +33,7 @@
% V1.12-added % to end of every key line to prevent extraneous spaces.
% V1.20-added support for figure and table wrappers
% V1.21-modified documentation slightly
+% V1.22-changed [h] default specifiers to [ht] to avoid warnings
\documentclass{ltxdoc}
\usepackage{boxhandler}
\DisableCrossrefs
@@ -446,13 +447,13 @@
% example
%
% \begin{verse}
-% |\bxfigure[h]{Widget details for the XMC-7936}%|\\
+% |\bxfigure[ht]{Widget details for the XMC-7936}%|\\
% | {\fbox{\hspace{1in}\rule[-.5ex]{3ex}{3ex} $\rightarrow$%|\\
% | \rule[-.2ex]{2ex}{2ex}\hspace{1in}}\Wrapper{PROPRIETARY}}%|\\
% \end{verse}
%
% \WrapperOn
-% \bxfigure[h]{Widget details for the XMC-7936}%
+% \bxfigure[ht]{Widget details for the XMC-7936}%
% {\fbox{\hspace{1in}\rule[-.5ex]{3ex}{3ex} $\rightarrow$%
% \rule[-.2ex]{2ex}{2ex}\hspace{1in}}\Wrapper{PROPRIETARY}%
% }
@@ -475,7 +476,7 @@
% simple example of how a document may be set up for conditional
% compilation.
%
-% \setlength\TableDeadMargin{0.2em}\bxtable[h]
+% \setlength\TableDeadMargin{0.2em}\bxtable[ht]
% {Conditionally compiled \LaTeX{} code\label{tbl:cccode}}
% {\begin{tabular}{c}\hline\\
% \ttfamily\parbox{4.15in}{
@@ -919,7 +920,7 @@
% command is defined by \boxhandler as:
%
%| |\\
-%|\newcommand\theClearedTable[4][h]{|\\
+%|\newcommand\theClearedTable[4][ht]{|\\
%| \vspace*{\fill}|\\
%| \ReciteTable[#1]{#2}{#3}{#4}{#5}{#6}|\\
%| \vspace*{\fill}|\\
@@ -935,7 +936,7 @@
%
%| |\\
%|\newcounter{toggle} \setcounter{toggle}{0}|\\
-%|\renewcommand\theClearedTable[4][h]{|\\
+%|\renewcommand\theClearedTable[4][ht]{|\\
%| \addtocounter{toggle}{1}|\\
%| \ifnum \arabic{toggle} = 2 \setcounter{toggle}{0} \fi|\\
%| \ifnum \arabic{toggle} = 1|\\
@@ -966,7 +967,7 @@
%%| } |\\
%%| |\\
%%|\usepackage{graphicx} |\\
-%%|\bxfigure[h] |\\
+%%|\bxfigure[ht] |\\
%%| {Here is an example of a particularly long caption that will |\\
%%| test wrapping} |\\
%%| {\includegraphics[width=3.64in,height=4.30in]{Atest1.eps}} |\\
@@ -993,7 +994,7 @@
%%|\newsavebox{\mybox} |\\
%%|\SaveCBox{\mybox}{\framebox(200,100){Ack!}} |\\
%%| |\\
-%%|\ReciteFigure[h]{\figcapii}{\figii}{\figcapwdthii}% |\\
+%%|\ReciteFigure[ht]{\figcapii}{\figii}{\figcapwdthii}% |\\
%%| {\figwrapii}{\figwrapstatusii} |\\
%%
% \vspace{-1em}
@@ -1424,7 +1425,7 @@
% restored, the table placement environment is concluded and the table
% itself is ended.
% \begin{macrocode}
-\newcommand\ReciteTable[6][h]{%
+\newcommand\ReciteTable[6][ht]{%
\begin{table}[#1]%
\begin{\LRTablePlacement}%
\let\@makecaption\new@makecaption%
@@ -1468,7 +1469,7 @@
% standard \LaTeX{} logic. If there are no uncleared tables left to
% format, then the command has no effect.
% \begin{macrocode}
-\newcommand\nextTable[1][h]{%
+\newcommand\nextTable[1][ht]{%
\ifnum\arabic{TableClearedIndex}<\arabic{TableIndex}{%
\addtocounter{TableClearedIndex}{1}%
%% \TableBoxLabel : tbli, tblii, tbliii, tbliv, etc.
@@ -1533,7 +1534,7 @@
% different clearing format is desired.
% \begin{macrocode}
%% \theClearedTable CAN BE RENEWED IF DIFFERENT OUTPUT FORMAT IS DESIRED
-\newcommand\theClearedTable[6][h]{%
+\newcommand\theClearedTable[6][ht]{%
%% CLEAR THIS TABLE ON A PAGE BY ITSELF, CENTERED VERTICALLY
\vspace*{\fill}%
\ReciteTable[#1]{#2}{#3}{#4}{#5}{#6}%
@@ -1600,7 +1601,7 @@
% In the case of |\ReciteFigure|, the figure-data box is output
% \textbf{before} the caption, not after.
% \begin{macrocode}
-\newcommand\ReciteFigure[6][h]{%
+\newcommand\ReciteFigure[6][ht]{%
\begin{figure}[#1]%
\begin{\LRFigurePlacement}%
\let\@makecaption\new@makecaption%
@@ -1639,7 +1640,7 @@
% \begin{macro}{\nextFigure}
% This routine is analogous to |\nextTable| in every way.
% \begin{macrocode}
-\newcommand\nextFigure[1][h]{%
+\newcommand\nextFigure[1][ht]{%
\ifnum\arabic{FigureClearedIndex}<\arabic{FigureIndex}{%
\addtocounter{FigureClearedIndex}{1}%
%% \FigureBoxLabel: : figi, figii, figiii, figiv, etc.
@@ -1694,7 +1695,7 @@
% figure per page, vertically centered.
% \begin{macrocode}
%% \theClearedFigure CAN BE RENEWED IF DIFFERENT OUTPUT FORMAT DESIRED
-\newcommand\theClearedFigure[6][h]{%
+\newcommand\theClearedFigure[6][ht]{%
%% CLEAR THIS FIGURE ON A PAGE BY ITSELF, CENTERED VERTICALLY
\vspace*{\fill}%
\ReciteFigure[#1]{#2}{#3}{#4}{#5}{#6}%
diff --git a/Master/texmf-dist/tex/latex/boxhandler/boxhandler.sty b/Master/texmf-dist/tex/latex/boxhandler/boxhandler.sty
index 00c1e2cd3ac..61ee7381c12 100644
--- a/Master/texmf-dist/tex/latex/boxhandler/boxhandler.sty
+++ b/Master/texmf-dist/tex/latex/boxhandler/boxhandler.sty
@@ -30,7 +30,7 @@
%% arlcaptions.sty.
%%
\ProvidesPackage{boxhandler}
-[2008/08/16 v1.21
+[2011/02/16 v1.22
Tools for Optimizing Captions, Presentation, and
Placement of Tables and Figures]
\NeedsTeXFormat{LaTeX2e}
@@ -49,7 +49,7 @@
%%| } |\\
%%| |\\
%%|\usepackage{graphicx} |\\
-%%|\bxfigure[h] |\\
+%%|\bxfigure[ht] |\\
%%| {Here is an example of a particularly long caption that will |\\
%%| test wrapping} |\\
%%| {\includegraphics[width=3.64in,height=4.30in]{Atest1.eps}} |\\
@@ -76,7 +76,7 @@
%%|\newsavebox{\mybox} |\\
%%|\SaveCBox{\mybox}{\framebox(200,100){Ack!}} |\\
%%| |\\
-%%|\ReciteFigure[h]{\figcapii}{\figii}{\figcapwdthii}% |\\
+%%|\ReciteFigure[ht]{\figcapii}{\figii}{\figcapwdthii}% |\\
%%| {\figwrapii}{\figwrapstatusii} |\\
%%
%% \CharacterTable
@@ -209,7 +209,7 @@
\WrapperText{\noexpand\WrapperTextStyle\WrapperTextDefault}%
}
-\newcommand\ReciteTable[6][h]{%
+\newcommand\ReciteTable[6][ht]{%
\begin{table}[#1]%
\begin{\LRTablePlacement}%
\let\@makecaption\new@makecaption%
@@ -242,7 +242,7 @@
\end{table}%
}
-\newcommand\nextTable[1][h]{%
+\newcommand\nextTable[1][ht]{%
\ifnum\arabic{TableClearedIndex}<\arabic{TableIndex}{%
\addtocounter{TableClearedIndex}{1}%
%% \TableBoxLabel : tbli, tblii, tbliii, tbliv, etc.
@@ -285,7 +285,7 @@
}
%% \theClearedTable CAN BE RENEWED IF DIFFERENT OUTPUT FORMAT IS DESIRED
-\newcommand\theClearedTable[6][h]{%
+\newcommand\theClearedTable[6][ht]{%
%% CLEAR THIS TABLE ON A PAGE BY ITSELF, CENTERED VERTICALLY
\vspace*{\fill}%
\ReciteTable[#1]{#2}{#3}{#4}{#5}{#6}%
@@ -330,7 +330,7 @@
\WrapperText{\noexpand\WrapperTextStyle\WrapperTextDefault}%
}
-\newcommand\ReciteFigure[6][h]{%
+\newcommand\ReciteFigure[6][ht]{%
\begin{figure}[#1]%
\begin{\LRFigurePlacement}%
\let\@makecaption\new@makecaption%
@@ -363,7 +363,7 @@
\end{figure}%
}
-\newcommand\nextFigure[1][h]{%
+\newcommand\nextFigure[1][ht]{%
\ifnum\arabic{FigureClearedIndex}<\arabic{FigureIndex}{%
\addtocounter{FigureClearedIndex}{1}%
%% \FigureBoxLabel: : figi, figii, figiii, figiv, etc.
@@ -406,7 +406,7 @@
}
%% \theClearedFigure CAN BE RENEWED IF DIFFERENT OUTPUT FORMAT DESIRED
-\newcommand\theClearedFigure[6][h]{%
+\newcommand\theClearedFigure[6][ht]{%
%% CLEAR THIS FIGURE ON A PAGE BY ITSELF, CENTERED VERTICALLY
\vspace*{\fill}%
\ReciteFigure[#1]{#2}{#3}{#4}{#5}{#6}%