minibox (21jun13)

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

4 files changed, 25 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/minibox/README b/Master/texmf-dist/doc/latex/minibox/README
index 0cdc7b177fb..6c67119faf6 100644
--- a/Master/texmf-dist/doc/latex/minibox/README
+++ b/Master/texmf-dist/doc/latex/minibox/README
@@ -1,6 +1,6 @@
 ___________________
 The minibox package
-v0.2
+v0.2a
 
 A small package to provide a convenient input syntax for
 boxes that don't break their text over lines automatically,
@@ -9,7 +9,7 @@ the natural width of the maximum line width.
 
     \minibox{Some\\ broken\\ text}
     \minibox[c]{Centred\\ broken\\ text}
-    \minibox[ct]{Centred\\ aligned\\ top}
+    \minibox[c,t]{Centred\\ aligned\\ top}
 
 Will Robertson
 Copyright 2009, 2013
diff --git a/Master/texmf-dist/doc/latex/minibox/minibox.pdf b/Master/texmf-dist/doc/latex/minibox/minibox.pdf
index 4c8e1232784..fc5fe200475 100644
--- a/Master/texmf-dist/doc/latex/minibox/minibox.pdf
+++ b/Master/texmf-dist/doc/latex/minibox/minibox.pdf
diff --git a/Master/texmf-dist/source/latex/minibox/minibox.tex b/Master/texmf-dist/source/latex/minibox/minibox.tex
index ea87f738882..98537a2460d 100644
--- a/Master/texmf-dist/source/latex/minibox/minibox.tex
+++ b/Master/texmf-dist/source/latex/minibox/minibox.tex
@@ -4,7 +4,7 @@
 \begin{filecontents*}{README.txt}
 ___________________
 The minibox package
-v0.2
+v0.2a
 
 A small package to provide a convenient input syntax for
 boxes that don't break their text over lines automatically,
@@ -13,7 +13,7 @@ the natural width of the maximum line width.
 
     \minibox{Some\\ broken\\ text}
     \minibox[c]{Centred\\ broken\\ text}
-    \minibox[ct]{Centred\\ aligned\\ top}
+    \minibox[c,t]{Centred\\ aligned\\ top}
 
 Will Robertson
 Copyright 2009, 2013
@@ -26,8 +26,8 @@ Copyright 2009, 2013
 \RequirePackage{expl3}
 \ProvidesExplPackage
   {minibox}
-  {2013/04/20}
-  {0.2}
+  {2013/06/21}
+  {0.2a}
   {Another type of box.}
 %    \end{macrocode}
 %
@@ -71,11 +71,14 @@ Copyright 2009, 2013
    } 
    { \use:n }
    {
-    \begin{tabular}
-      [\l_minibox_tabular_valign_tl]
-      { @{} \l_minibox_tabular_preamble_tl @{} }
-     #2
-    \end{tabular}
+    \use:x
+     {
+      \exp_not:N \begin{tabular}
+        [\l_minibox_tabular_valign_tl]
+        { @{} \l_minibox_tabular_preamble_tl @{} }
+       \exp_not:n {#2}
+      \exp_not:N \end{tabular}
+     }
    }
   \group_end:
  }
@@ -111,7 +114,7 @@ Copyright 2009, 2013
 \usepackage{xcolor,booktabs}
 \usepackage[colorlinks,linktocpage]{hyperref}
 
-\usepackage{tocloft,varwidth}
+\usepackage{tocloft,varwidth,array}
 \setcounter{tocdepth}{1}
 \def\tocwidthA{0.45}
 \def\tocwidthB{0.45}
@@ -135,7 +138,6 @@ Copyright 2009, 2013
 \usepackage[T1]{fontenc}
 \usepackage{microtype}
 \usepackage{lmodern}
-\usepackage[sc,osf]{mathpazo}
 \linespread{1.1}
 \frenchspacing
 
@@ -276,10 +278,6 @@ You can change the defaults of \cs{minibox} using this command.
 \end{tabular}
 \end{center}
 
-\subsection{Cautionary note, perhaps}
-
-If you look at the source you'll see that the way \cmd\minibox\ command is implemented lends itself to begin mis-used to input generic tabular material; this is not the intention of the command, however, and any such usage may break in future versions of this package.
-
 \section{Licence}
 
 This package is freely modifiable and distributable under the terms and conditions of the \LaTeX\ Project Public Licence, version 1.3c or greater (your choice). The latest version of
diff --git a/Master/texmf-dist/tex/latex/minibox/minibox.sty b/Master/texmf-dist/tex/latex/minibox/minibox.sty
index 039620799e9..7ff967058f4 100644
--- a/Master/texmf-dist/tex/latex/minibox/minibox.sty
+++ b/Master/texmf-dist/tex/latex/minibox/minibox.sty
@@ -2,8 +2,8 @@
 \RequirePackage{expl3}
 \ProvidesExplPackage
   {minibox}
-  {2013/04/20}
-  {0.2}
+  {2013/06/21}
+  {0.2a}
   {Another type of box.}
 %    \end{macrocode}
 %
@@ -47,11 +47,14 @@
    }
    { \use:n }
    {
-    \begin{tabular}
-      [\l_minibox_tabular_valign_tl]
-      { @{} \l_minibox_tabular_preamble_tl @{} }
-     #2
-    \end{tabular}
+    \use:x
+     {
+      \exp_not:N \begin{tabular}
+        [\l_minibox_tabular_valign_tl]
+        { @{} \l_minibox_tabular_preamble_tl @{} }
+       \exp_not:n {#2}
+      \exp_not:N \end{tabular}
+     }
    }
   \group_end:
  }