pbox (25nov11)

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

4 files changed, 25 insertions, 121 deletions

diff --git a/Master/texmf-dist/source/latex/pbox/Makefile b/Master/texmf-dist/source/latex/pbox/Makefile
deleted file mode 100644
index e9e121e646a..00000000000
--- a/Master/texmf-dist/source/latex/pbox/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-## Makefile - Makefile for the pbox package.
-## Copyright (C) 2003  Simon Law
-##
-##   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
-##   (at your option) any later version.
-##
-##   This program is distributed in the hope that it will be useful,
-##   but WITHOUT ANY WARRANTY; without even the implied warranty of
-##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##   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
-##
-
-# Set the package name
-PACKAGE = pbox
-
-# Use pdfLaTeX for best results
-LATEX = pdflatex
-LATEX2DVI = $(LATEX) \\pdfoutput=0 \\input
-LATEX2PDF = $(LATEX) \\pdfoutput=1 \\input
-
-# MakeIndex parameters
-MAKEINDEX = makeindex
-GIND = gind.ist
-GGLO = gglo.ist
-
-# Installation
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = $(INSTALL) -m 644
-DESTDIR = .
-TDSFORMAT = latex/
-
-# Shell
-RM = rm -f
-
-TEXFILES=\
-         $(PACKAGE).aux\
-         $(PACKAGE).drv\
-         $(PACKAGE).dvi\
-         $(PACKAGE).glo\
-         $(PACKAGE).gls\
-         $(PACKAGE).idx\
-         $(PACKAGE).ilg\
-         $(PACKAGE).ind\
-         $(PACKAGE).log\
-         $(PACKAGE).pdf\
-         $(PACKAGE).sty
-
-.PHONY : all install uninstall dvi pdf clean
-
-all : $(PACKAGE).sty $(PACKAGE).dvi $(PACKAGE).pdf ;
-
-install : all
-	$(INSTALL) -d $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)
-	$(INSTALL) -d $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)
-	$(INSTALL_DATA) $(PACKAGE).sty $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)/
-	$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/
-	$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/
-
-uninstall : all
-	$(RM) $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)/$(PACKAGE).sty
-	$(RM) $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/$(PACKAGE).dvi
-	$(RM) $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/$(PACKAGE).pdf
-	ls $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)/* >/dev/null 2>&1  \
-	    || $(RM) -r $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)
-	ls $(DESTDIR)/texmf/doc/$(PACKAGE)/* >/dev/null 2>&1 \
-	    || $(RM) -r $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)
-
-dvi : $(PACKAGE).dvi
-
-pdf : $(PACKAGE).pdf
-
-%.sty : %.ins %.dtx
-	$(LATEX) $<
-
-%.dvi : %.dtx %.sty
-	$(LATEX2DVI) $<
-	$(MAKEINDEX) -s $(GIND) $*.idx
-	$(MAKEINDEX) -s $(GGLO) -o $*.gls $*.glo
-	$(LATEX2DVI) $<
-
-%.pdf : %.dtx %.sty
-	$(LATEX2PDF) $<
-	$(MAKEINDEX) -s $(GIND) $*.idx
-	$(MAKEINDEX) -s $(GGLO) -o $*.gls $*.glo
-	$(LATEX2DVI) $<
-
-
-clean :
-	$(RM) $(TEXFILES)
diff --git a/Master/texmf-dist/source/latex/pbox/pbox.drv b/Master/texmf-dist/source/latex/pbox/pbox.drv
index 8aec30f4c65..e04df1ff09b 100644
--- a/Master/texmf-dist/source/latex/pbox/pbox.drv
+++ b/Master/texmf-dist/source/latex/pbox/pbox.drv
@@ -6,11 +6,11 @@
 %%
 %% pbox.dtx  (with options: `driver')
 %% 
-%% 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,8 +19,7 @@
 %%   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}[1995/12/01]
 \documentclass{ltxdoc}
diff --git a/Master/texmf-dist/source/latex/pbox/pbox.dtx b/Master/texmf-dist/source/latex/pbox/pbox.dtx
index a4861115c3b..6094487c2b5 100644
--- a/Master/texmf-dist/source/latex/pbox/pbox.dtx
+++ b/Master/texmf-dist/source/latex/pbox/pbox.dtx
@@ -1,25 +1,24 @@
 % \iffalse meta-comment
 % pbox.dtx - DocStrip source code for the pbox package
-% 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,
 %   but WITHOUT ANY WARRANTY; without even the implied warranty of
 %   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 %   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/>.
 %
 % \fi
 % \iffalse
 %<style>\NeedsTeXFormat{LaTeX2e}
-%<style>\ProvidesPackage{pbox}[2003/04/06 v1.0 Dynamic parboxes]
+%<style>\ProvidesPackage{pbox}[2011/11/24 v1.1 Dynamic parboxes]
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \documentclass{ltxdoc}
@@ -47,7 +46,7 @@
 % \fi
 %
 % \StopEventually{\PrintIndex \PrintChanges}
-% \CheckSum{77}
+% \CheckSum{78}
 %
 % \DoNotIndex{\begin}
 % \DoNotIndex{\columnwidth}
@@ -78,13 +77,14 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
+% \changes{v1.1}{2011/11/24}{Switch to GPLv3.}
 % \changes{v1.0}{2003/03/19}{Initial release.}
 %
 % \GetFileInfo{pbox.sty}
 %
 % \title{The \textsf{pbox} package\thanks{Version \fileversion, 
 %                                         last revised \filedate}}
-% \author{Simon Law \\ \url{sfllaw@engmail.uwaterloo.ca}}
+% \author{Simon Law \\ \url{sfllaw@sfllaw.ca}}
 % \maketitle
 %^^A \tableofcontents
 %
@@ -223,6 +223,7 @@
 % Alas, I have also discovered that certain uses of |\widthof| and
 % |\widthofpbox| do not work within the \textsf{docstrip} environment.
 %
+% \newpage
 % \section{Implementation}
 % \iffalse
 %<*style>
@@ -243,6 +244,7 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\settominwidth}
+% \changes{v1.1}{2011/11/24}{Always return a robust value.}
 % The minimum length is determined by the clever use of the
 % \textbf{tabular} environment.  It knows how to calculate the minimum
 % requisite width for a column, and the way determines the end of a
@@ -266,7 +268,7 @@
 % Finally, I wish to make sure that the length I have set in |#2| is
 % not larger than the maximum stored in |#1|.
 %    \begin{macrocode}
-  \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{#1}}}
+  \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{\protect{#1}}}}
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/pbox/pbox.ins b/Master/texmf-dist/source/latex/pbox/pbox.ins
index 6661447e83f..9933f941810 100644
--- a/Master/texmf-dist/source/latex/pbox/pbox.ins
+++ b/Master/texmf-dist/source/latex/pbox/pbox.ins
@@ -1,9 +1,9 @@
 %% pbox.ins - LaTeX Installation file for the pbox package.
-%% 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,
@@ -12,19 +12,18 @@
 %%   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/>.
 %%
 \input docstrip
 \askforoverwritefalse
 \keepsilent
 \preamble
 
-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,
@@ -33,8 +32,7 @@ Copyright (C) 2003  Simon Law
   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/>.
 
 \endpreamble
 \generate{%