pbox (25nov11)

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

1 files changed, 6 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/pbox/pbox.sty b/Master/texmf-dist/tex/latex/pbox/pbox.sty
index d93146d20b9..856a408c64a 100644
--- a/Master/texmf-dist/tex/latex/pbox/pbox.sty
+++ b/Master/texmf-dist/tex/latex/pbox/pbox.sty
@@ -6,11 +6,11 @@
 %%
 %% pbox.dtx  (with options: `style')
 %% 
-%% Copyright (C) 2003  Simon Law
+%% Copyright (C) 2003,2011  Simon Law
 %% 
-%%   This program is free software; you can redistribute it and/or modify
+%%   This program is free software: you can redistribute it and/or modify
 %%   it under the terms of the GNU General Public License as published by
-%%   the Free Software Foundation; either version 2 of the License, or
+%%   the Free Software Foundation, either version 3 of the License, or
 %%   (at your option) any later version.
 %% 
 %%   This program is distributed in the hope that it will be useful,
@@ -19,16 +19,15 @@
 %%   GNU General Public License for more details.
 %% 
 %%   You should have received a copy of the GNU General Public License
-%%   along with this program; if not, write to the Free Software
-%%   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+%%   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pbox}[2003/04/06 v1.0 Dynamic parboxes]
+\ProvidesPackage{pbox}[2011/11/24 v1.1 Dynamic parboxes]
 \RequirePackage{calc}
 \RequirePackage{ifthen}
 \newcommand{\settominwidth}[3][\columnwidth]{%
   \settowidth{#2}{\begin{tabular}{@{}l@{}}#3\end{tabular}}%
-  \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{#1}}}
+  \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{\protect{#1}}}}
 \newcommand{\widthofpbox}[1]{%
   \widthof{\begin{tabular}{@{}l@{}}#1\end{tabular}}}
 \DeclareRobustCommand*{\pbox}[1][]{%