4 files changed, 35 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/trivfloat/trivfloat.pdf b/Master/texmf-dist/doc/latex/trivfloat/trivfloat.pdf
index ef85cdc27ee..1fdc477e7c1 100644
--- a/Master/texmf-dist/doc/latex/trivfloat/trivfloat.pdf
+++ b/Master/texmf-dist/doc/latex/trivfloat/trivfloat.pdf
diff --git a/Master/texmf-dist/source/latex/trivfloat/trivfloat.dtx b/Master/texmf-dist/source/latex/trivfloat/trivfloat.dtx
index 77bce625633..dd4268555f6 100644
--- a/Master/texmf-dist/source/latex/trivfloat/trivfloat.dtx
+++ b/Master/texmf-dist/source/latex/trivfloat/trivfloat.dtx
@@ -17,7 +17,11 @@
 %\OnlyDescription
 \usepackage[T1]{fontenc}
 \usepackage[english,UKenglish]{babel}
-\usepackage{mathpazo,booktabs,array,url}
+\usepackage{mathpazo,booktabs,array,url,graphicx,courier,unitsdef}
+\usepackage{upgreek}
+\usepackage[scaled=0.95]{helvet}
+\usepackage[version=3]{mhchem}
+\usepackage[final]{microtype}
 \usepackage{\jobname}
 \begin{document}
   \DocInput{\jobname.dtx}
@@ -25,7 +29,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{107}
+% \CheckSum{113}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -46,6 +50,8 @@
 % \GetFileInfo{\jobname.sty}
 %
 % \changes{v1.0}{2007/06/09}{Initial public release}
+% \changes{v1.1}{2007/08/13}{Floats can be generated as package
+%   options}
 %
 % \DoNotIndex{\@eha,\@ne,\advance,\begingroup,\csname,\def,\edef}
 % \DoNotIndex{\else,\end,\endcsname,\endgroup,\expandafter,\fi}
@@ -54,11 +60,14 @@
 % \DoNotIndex{\noexpand,\or,\PackageError,\PackageInfo}
 % \DoNotIndex{\PackageWarning,\ProvidesPackage,\RequirePackage}
 % \DoNotIndex{\romannumeral,\x}
+% \DoNotIndex{\CurrentOption,\DeclareOption,\ProcessOptions}
 %
-% \title{Quick floats in LaTeX}
+% \title{Quick floats in LaTeX%
+%   \thanks{This file describes version \fileversion, last revised
+%           \filedate.}}
 % \author{Joseph Wright%
-% \thanks{E-mail: joseph.wright@morningstar2.co.uk}}
-% \date{\filedate}
+%   \thanks{E-mail: joseph.wright@morningstar2.co.uk}}
+% \date{Released \filedate}
 %
 % \maketitle
 %
@@ -92,6 +101,10 @@
 % environments.  The command |\listof|\meta{float-name}|s| is also
 % provided.
 %
+% New floats can also be generated by passing the name of the desired
+% float type to the package as an option.  This works in exactly the
+% same way as the \cmd{\trivfloat} command.
+%
 % \StopEventually{}
 %
 % \iffalse
@@ -107,7 +120,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{trivfloat}
-  [2007/06/09 v1.0 Quick floats in LaTeX]
+  [2007/08/13 v1.1 Quick floats in LaTeX]
 \RequirePackage{float}
 %    \end{macrocode}
 %
@@ -217,8 +230,8 @@
 % \begin{macro}{\tfl@list}
 % \begin{macro}{\listoffloat-names}
 % An auxiliary function is needed to define the
-%|\listof\emph{float-name}s| macros.  This is to ensure that
-% expansion occurs properly.
+% \texttt{\textbackslash listof\emph{float-name}s} macros.  This is
+% to ensure that expansion occurs properly.
 %    \begin{macrocode}
 \def\tfl@list#1#2#3{%
   \newcommand*{#1}{\listof{#2}{#3}}%
@@ -263,6 +276,15 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \subsection{Package options}
+%
+% Any package options given are assumed to be new float types.
+% Every option is therefore passed to \cmd{\trivfloat}.
+%    \begin{macrocode}
+\DeclareOption*{\expandafter\trivfloat\expandafter{\CurrentOption}}
+\ProcessOptions
+%    \end{macrocode}
+%
 % \iffalse
 %</package>
 % \fi
diff --git a/Master/texmf-dist/tex/latex/trivfloat/trivfloat.sty b/Master/texmf-dist/tex/latex/trivfloat/trivfloat.sty
index 091b15752ff..014d2a2e6e7 100644
--- a/Master/texmf-dist/tex/latex/trivfloat/trivfloat.sty
+++ b/Master/texmf-dist/tex/latex/trivfloat/trivfloat.sty
@@ -14,7 +14,7 @@
 %%  ----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{trivfloat}
-  [2007/06/09 v1.0 Quick floats in LaTeX]
+  [2007/08/13 v1.1 Quick floats in LaTeX]
 \RequirePackage{float}
 \newcount\tfl@floatcount%
 \def\tfl@genext{%
@@ -112,6 +112,8 @@
     }%
   \x%
 }%
+\DeclareOption*{\expandafter\trivfloat\expandafter{\CurrentOption}}
+\ProcessOptions
 \endinput
 %%
 %% End of file `trivfloat.sty'.
diff --git a/Master/tlpkg/tlpsrc/trivfloat.tlpsrc b/Master/tlpkg/tlpsrc/trivfloat.tlpsrc
new file mode 100644
index 00000000000..9af8d6d0b70
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/trivfloat.tlpsrc
@@ -0,0 +1,2 @@
+name trivfloat
+category Package