diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/pbox/ChangeLog | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pbox/Makefile | 17 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pbox/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pbox/pbox.pdf | bin | 234574 -> 236690 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/pbox/pbox.dtx | 40 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pbox/pbox.sty | 4 |
6 files changed, 58 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/pbox/ChangeLog b/Master/texmf-dist/doc/latex/pbox/ChangeLog index eddbad96acd..b670f5d5e9b 100644 --- a/Master/texmf-dist/doc/latex/pbox/ChangeLog +++ b/Master/texmf-dist/doc/latex/pbox/ChangeLog @@ -1,7 +1,12 @@ For more details about the changes that are made to the style itself, please see the Changes section of the documentation. -2003-04-06 Simon Law <sfllaw@sfllaw.ca> +2011-12-07 Simon Law <sfllaw@sfllaw.ca> + + Version 1.2. + * pbox.dtx: Really fix the minimum-width bug in \pbox. + +2011-11-24 Simon Law <sfllaw@sfllaw.ca> Version 1.1. Switch to GPLv3. * pbox.dtx: Fix \pbox so that it works even when the contents diff --git a/Master/texmf-dist/doc/latex/pbox/Makefile b/Master/texmf-dist/doc/latex/pbox/Makefile index 606dfd81c9a..c35fe508883 100644 --- a/Master/texmf-dist/doc/latex/pbox/Makefile +++ b/Master/texmf-dist/doc/latex/pbox/Makefile @@ -36,6 +36,7 @@ TDSFORMAT = latex/ # Shell RM = rm -f +ZIP = zip -9 TEXFILES=\ $(PACKAGE).aux\ @@ -50,6 +51,17 @@ TEXFILES=\ $(PACKAGE).pdf\ $(PACKAGE).sty +PKGFILES=\ + AUTHORS\ + COPYING\ + ChangeLog\ + INSTALL\ + Makefile\ + README\ + $(PACKAGE).dtx\ + $(PACKAGE).ins\ + $(PACKAGE).pdf + .PHONY : all install uninstall dvi pdf clean all : $(PACKAGE).sty $(PACKAGE).dvi $(PACKAGE).pdf ; @@ -89,6 +101,9 @@ pdf : $(PACKAGE).pdf $(MAKEINDEX) -s $(GGLO) -o $*.gls $*.glo $(LATEX2DVI) $< +$(PACKAGE).zip : $(PKGFILES) + $(RM) $@ + $(ZIP) $@ $^ clean : - $(RM) $(TEXFILES) + $(RM) $(TEXFILES) $(PACKAGE).zip diff --git a/Master/texmf-dist/doc/latex/pbox/README b/Master/texmf-dist/doc/latex/pbox/README index 7b171aa1cd5..1a85ccb490e 100644 --- a/Master/texmf-dist/doc/latex/pbox/README +++ b/Master/texmf-dist/doc/latex/pbox/README @@ -1,7 +1,7 @@ pbox ==== -This is pbox, version 1.1. It implements a variable-width \parbox and +This is pbox, version 1.2. It implements a variable-width \parbox and some convenient length commands. The \pbox command is equivalent to the \parbox command, only the width specified is merely the maximum width; the \pbox tries to fit itself tightly around the specified text. @@ -16,4 +16,4 @@ have a series of boxes, all with the same minimized width. Happy Hacking. - -- Simon Law <sfllaw@sfllaw.ca> Thu 24 Nov 2011 16:18:51 PM -0600 + -- Simon Law <sfllaw@sfllaw.ca> Thu 7 Dec 2011 2:21:51 PM -0600 diff --git a/Master/texmf-dist/doc/latex/pbox/pbox.pdf b/Master/texmf-dist/doc/latex/pbox/pbox.pdf Binary files differindex c5e2958d95f..aeea8072b31 100644 --- a/Master/texmf-dist/doc/latex/pbox/pbox.pdf +++ b/Master/texmf-dist/doc/latex/pbox/pbox.pdf diff --git a/Master/texmf-dist/source/latex/pbox/pbox.dtx b/Master/texmf-dist/source/latex/pbox/pbox.dtx index 6094487c2b5..e437175d785 100644 --- a/Master/texmf-dist/source/latex/pbox/pbox.dtx +++ b/Master/texmf-dist/source/latex/pbox/pbox.dtx @@ -18,7 +18,7 @@ % \fi % \iffalse %<style>\NeedsTeXFormat{LaTeX2e} -%<style>\ProvidesPackage{pbox}[2011/11/24 v1.1 Dynamic parboxes] +%<style>\ProvidesPackage{pbox}[2011/12/07 v1.2 Dynamic parboxes] %<*driver> \NeedsTeXFormat{LaTeX2e}[1995/12/01] \documentclass{ltxdoc} @@ -46,7 +46,7 @@ % \fi % % \StopEventually{\PrintIndex \PrintChanges} -% \CheckSum{78} +% \CheckSum{77} % % \DoNotIndex{\begin} % \DoNotIndex{\columnwidth} @@ -112,14 +112,14 @@ % \makeatletter % \begingroup\center % \begin{minipage}[c]{\ExampleWidth-5mm} -% \parbox[b]{2cm}{Hello\\World!}^^A -% \parbox[t]{2cm}{Bonjour\\monde!} +% \parbox[b]{1.5cm}{Hello\\World!}^^A +% \parbox[t]{1.5cm}{Bonjour\\monde!} % \end{minipage} % \begin{minipage}{\textwidth-\ExampleWidth} % \fvset{xrightmargin=0pt} % \begin{Verbatim} -% \parbox[b]{2cm}{Hello\\World!}% -% \parbox[t]{2cm}{Bonjour\\monde!} +% \parbox[b]{1.5cm}{Hello\\World!}% +% \parbox[t]{1.5cm}{Bonjour\\monde!} % \end{Verbatim} % \end{minipage} % \endcenter\endgroup @@ -146,11 +146,34 @@ % \end{minipage} % \endcenter\endgroup % \makeatother -% \end{DescribeMacro} % Notice how the exclaimation mark and the capital B have no extra % space between each other, implying that |\pbox| creates minimal-width % boxes. % +% If the provided width argument is smaller than the minimal-width, +% then |\pbox| acts just like a regular |\parbox|. By minimal-width, +% we mean the width of the unwrapped piece of text. You will have to +% put in line breaks, to make |\pbox| create the tightest bounding box. +% +% For instance, the following example tries to get |\pbox| to wrap its +% lines automatically. +% \makeatletter +% \begingroup\center +% \begin{minipage}[c]{\ExampleWidth-5mm} +% \pbox[b]{1.5cm}{Hello World!}^^A +% \pbox[t]{1.5cm}{Bonjour monde!} +% \end{minipage} +% \begin{minipage}{\textwidth-\ExampleWidth} +% \fvset{xrightmargin=0pt} +% \begin{Verbatim} +% \pbox[b]{1.5cm}{Hello World!}% +% \pbox[t]{1.5cm}{Bonjour monde!} +% \end{Verbatim} +% \end{minipage} +% \endcenter\endgroup +% \makeatother +% \end{DescribeMacro} +% % \section{Determining minimum widths} % % This is all well and good, but how does one measure the width of one @@ -245,6 +268,7 @@ % % \begin{macro}{\settominwidth} % \changes{v1.1}{2011/11/24}{Always return a robust value.} +% \changes{v1.2}{2011/12/07}{Really fix the result.} % 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 @@ -268,7 +292,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}{\protect{#1}}}} + \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{#1}}{}} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/tex/latex/pbox/pbox.sty b/Master/texmf-dist/tex/latex/pbox/pbox.sty index 856a408c64a..22d0dd1451c 100644 --- a/Master/texmf-dist/tex/latex/pbox/pbox.sty +++ b/Master/texmf-dist/tex/latex/pbox/pbox.sty @@ -22,12 +22,12 @@ %% along with this program. If not, see <http://www.gnu.org/licenses/>. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pbox}[2011/11/24 v1.1 Dynamic parboxes] +\ProvidesPackage{pbox}[2011/12/07 v1.2 Dynamic parboxes] \RequirePackage{calc} \RequirePackage{ifthen} \newcommand{\settominwidth}[3][\columnwidth]{% \settowidth{#2}{\begin{tabular}{@{}l@{}}#3\end{tabular}}% - \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{\protect{#1}}}} + \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{#1}}{}} \newcommand{\widthofpbox}[1]{% \widthof{\begin{tabular}{@{}l@{}}#1\end{tabular}}} \DeclareRobustCommand*{\pbox}[1][]{% |