hvfloat (5mar12)

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

6 files changed, 218 insertions, 930 deletions

diff --git a/Master/texmf-dist/doc/latex/hvfloat/README b/Master/texmf-dist/doc/latex/hvfloat/README
new file mode 100644
index 00000000000..7bcfd0f9254
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/README
@@ -0,0 +1,8 @@
+hvfloat.sty:    
+1.1  2012-03-04  - added environment hvFloatEnv
+                 - don't load package ifthen
+                 - load package caption by default
+0.9  2003        Rotating floating objects and captions in different ways
+
+hvfloat.tex:    the source of the documentation
+
diff --git a/Master/texmf-dist/doc/latex/hvfloat/VERSION-1.1 b/Master/texmf-dist/doc/latex/hvfloat/VERSION-1.1
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/VERSION-1.1
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index d4af55ebc8d..a4e680bf4a3 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
index 1e743f5e6b4..65bbf3882a4 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
@@ -30,11 +30,11 @@
 \usepackage{multicol}
 \usepackage[pdftitle={hvfloat - Rotating Objects and Captions}, pdfauthor={Herbert Voß}, urlcolor=blue, linktocpage, a4paper, colorlinks=true]{hyperref}
 %
-\newcommand{\CMD}[1]{{\small\ttfamily\textbackslash{}#1}}
-\newcommand{\ENV}[1]{{\small\ttfamily#1} Environment}
+\newcommand\CMD[1]{{\small\ttfamily\textbackslash{}#1}}
+\newcommand\ENV[1]{{\small\ttfamily#1} Environment}
 %
 \begin{document}
-\title{Package \texttt{hvfloat}\\Rotating Objects and Captions\\ver 1.0}
+\title{Package \texttt{hvfloat}\\Rotating objects and captions\\ver 1.1}
 \author{Herbert Voß\thanks{\protect\url{voss@perce.de}}}
 \date{\today}
 \maketitle
@@ -107,7 +107,7 @@ reference to  the not existing table \ref{dummy} is no problem.
 There are following options:\\[1ex]
 \begin{table}[!htb]
 \caption{The Options for the Macro \texttt{hvFloat}}\label{tab:options}
-\begin{tabularx}{\textwidth}{lcX}
+\begin{tabularx}{\textwidth}{lcX}\hline
 Option & Default &Description\\\hline
 \texttt{floatPos} & \texttt{htb} & This is the same placement option like the one from the floats.\\
 \texttt{rotAngle} & 0& The value for the angle if both, the object and the caption should be rotated in the same way.\\
@@ -129,6 +129,7 @@ Option & Default &Description\\\hline
 \texttt{useOBox} & \texttt{false} & Instead of passing the object as parameter to the \texttt{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\
 
 \texttt{nonFloat} & \texttt{false} & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counters are increased as usual and can be referenced.
+\\\hline
 \end{tabularx} 
 \end{table}
  
@@ -155,11 +156,12 @@ Code for figure \ref{fig:0}:
 	\begin{tabularx}{\textwidth}{l|l|X}
 		Name &	Type & Description\\\hline
 		\texttt{hvFloat}  & command     & places object and caption in different ways\\
+		\texttt{hvFloatEnv}  & environment & places object and caption exactly Here\\
 		\texttt{figcaption} & command   & writes a figure caption in a non floating environment\\
 		\texttt{tabcaption} & command   & writes a table caption in a non floating environment\\
 		\texttt{setDefaults} & command  & sets all options to the defaults
 	\end{tabularx}%
-}[Caption on top of a table]{With the only Option \texttt{capPos=t} to place the caption on top of the table, which is often the default}{tab:0}
+}{With the only Option \texttt{capPos=t} to place the caption on top of the table, which is often the default}{tab:0}
 
 Code for table \ref{tab:0}:
 \begin{lstlisting}[xrightmargin=-8em,xleftmargin=-3em]
@@ -167,6 +169,7 @@ Code for table \ref{tab:0}:
 	\begin{tabularx}{\textwidth}{l|l|X}
 		Name &	Type & Description\\\hline
 		\CMD{hvFloat} & command & places object and caption in different ways\\
+		\texttt{hvFloatEnv}  & environment & places object and caption exactly Here\\
 		\CMD{figcaption} & command & writes a figure caption in a non floating environment\\
 		\CMD{tabcaption} & command & writes a table caption in a non floating environment\\
 		\CMD{setDefaults} & command & sets all options to the defaults
@@ -444,6 +447,7 @@ The object has to be passed as an parameter to the \texttt{hvFloat} macro. This
 \begin{tabular}{l|l|l}
 	Name &	Type & Description\\\hline
 \texttt{hvFloat}  & command     & places object and caption in different ways\\
+\texttt{hvFloatEnv}  & environment & places object and caption exactly Here\\
 \texttt{figcaption} & command   & writes a figure caption in a non floating environment\\
 \texttt{tabcaption} & command   & writes a table caption in a non floating environment\\
 \texttt{setDefaults} & command  & sets all options to the defaults
@@ -455,6 +459,7 @@ The object has to be passed as an parameter to the \texttt{hvFloat} macro. This
 \begin{tabular}{l|l|l}
 	Name &	Type & Description\\\hline
 	\texttt{hvFloat}  & command     & places object and caption in different ways\\
+	\texttt{hvFloatEnv}  & environment & places object and caption exactly Here\\
 	\texttt{figcaption} & command   & writes a figure caption in a non floating environment\\
 	\texttt{tabcaption} & command   & writes a table caption in a non floating environment\\
 	\texttt{setDefaults} & command  & sets all options to the defaults
@@ -524,16 +529,57 @@ The code for figure \ref{fig:text}:
 \end{lstlisting}
 
 
+
+\section{Environment \texttt{hvFloatEnv}}\label{sec:env}
+
+With the environment \texttt{hvFloat} one can place an object exactly on that position where the
+environment is defined. For captions the use of \CMD{captionof} is recommended:
+
+\begin{hvFloatEnv}
+\captionof{table}{A caption for a nice table}
+\begin{tabular}{@{} l c r @{}}\hline
+left & center & right \\
+L    & C      & R     \\\hline
+\end{tabular}
+\end{hvFloatEnv}
+
+\begin{lstlisting}
+\begin{hvFloatEnv}
+\captionof{table}{A caption for a nice table}
+\begin{tabular}{@{} l c r @{}}\hline
+left & center & right \\
+L    & C      & R     \\\hline
+\end{tabular}
+\end{hvFloatEnv}
+\end{lstlisting}
+
+The environment has an optional argument for setting the line width which is preset to \CMD{textwidth}.
+The object is always centered.
+
+\begin{hvFloatEnv}[0.5\textwidth]
+\captionof{table}{A caption for a nice table}
+\begin{tabular}{@{} l c r @{}}\hline
+left & center & right \\
+L    & C      & R     \\\hline
+\end{tabular}
+\end{hvFloatEnv}
+
+\begin{lstlisting}
+\begin{hvFloatEnv}[0.5\textwidth]
+\captionof{table}{A caption for a nice table}
+\begin{tabular}{@{} l c r @{}}\hline
+left & center & right \\
+L    & C      & R     \\\hline
+\end{tabular}
+\end{hvFloatEnv}
+\end{lstlisting}
+
+
+
 \appendix
 \section{Problems}
 \begin{itemize}
 \item[] With the \texttt{nonfloat} option all objects are left aligned, \verb|\centering| doesn't work here. Only God knows why ...\hfill \textbf{solved!}
-\item[] Optional Arguments for a short caption doesn't work for the \verb|nonfloat| option.\hfill \textbf{solved!}
-\end{itemize}
-
-\section{To Do}
-\begin{itemize}
-\item[] Using the \texttt{float} package to create by default a new \ENV{float}, when the one which is passed to \CMD{hvfloat} is not defined.
 \end{itemize}
 
 
diff --git a/Master/texmf-dist/doc/latex/hvfloat/rose.eps b/Master/texmf-dist/doc/latex/hvfloat/rose.eps
deleted file mode 100644
index ef14f639e47..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/rose.eps
+++ /dev/null
@@ -1,717 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (rose.eps)
-%%CreationDate: (Wed Apr 23 19:37:33 2003)
-%%BoundingBox: 0 0 107 133
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 1
-%%EndComments
-
-%%BeginDefaults
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 eq
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 eq
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 eq
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 eq
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-none or 1-RunlengthEncoded.
-  %   hex color packets.
-  %
-  gsave
-  /buffer 512 string def
-  /byte 1 string def
-  /color_packet 3 string def
-  /pixels 768 string def
-
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Times-Roman findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 107 133
-userdict begin
-DisplayImage
-0 0
-107 133
-12.000000
-107 133
-1
-0
-0
-42
-F8FCF8
-707470
-E8ECE8
-D8DCD8
-A8A8A8
-C8CCC8
-989898
-B8B8B8
-888888
-F80000
-A0A0A0
-A8ACA8
-686868
-707070
-888C88
-808480
-C0C0C0
-686C68
-505050
-606460
-A0A4A0
-909490
-606060
-505450
-484848
-B8BCB8
-989C98
-404040
-404440
-585C58
-B0B0B0
-585858
-383838
-787878
-202020
-484C48
-383C38
-787C78
-008800
-282828
-303030
-101010
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000010102030000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000405030607010605000003010606010402
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000501080105000206050909020408080A0B0C0609090900020806
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000060009000404010009090806020A0D080607010909090909090703
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000201010909090E0F0710000908020006110909090909090908060009090403
-070601040300000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000800090909091201000800090809090606090909090909090903080909130705
-000002070102000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000005040009090900010800080009010906020100040107070404090901090900000909
-090909000607000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-02060909090909020405070509090609010008000A0A0000000807040108140209090909
-090909090506000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000002060804
-090909090009080000080008060209150809000601000909090000050107130909090909
-090909000504000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000808020909
-090009090405090006050704030916000903040100090909090901001717030909090002
-070000060300000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000204090009
-0909040509090006040E0001090406090600070004061809000100060806000902060607
-120500060102000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000009090909
-0008000900020608020612090005050803070603000511190400081A1B06080703000007
-080009020800000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000109090909
-0700090003010909000F0609090115010001090909011B0004080603000000090904030D
-080900060302000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000080809090904
-0009090000120909040100090909010006090909061C0C11050909090909090904000100
-090900040100000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000006020809090602
-09090900010909120F0500000909011909090900041D0000090909000208070003080004
-090003040000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000008040909000801
-01061212070303011E09090909001309090000010804041F1D0D0C0602040606030C1500
-051F04080400000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000506080606040701090909090900
-000002060909090407070909090005010807150C01030000031F01080F01041D060F0106
-000000030400000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000206090909030002011209090909090909
-0909120D20091F05010206211722130108070000060D0C21040603020608020223000309
-090900080000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000002080401090909000004080606241F05000906010706
-060000000007130206060B0C05000701040107070F0A0D1D070704020005080D25000900
-090513000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000800090909000909090300000909020A08180500000909
-090909000600010002010606030909070805000005040701010707251306040600090909
-040208000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000010909000909090F00090909090009090909050600090000
-00090901000307090002070D090909000701060402070301040603000506000900090809
-09041A000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000004090909090508150209090909090909090900060209000909
-090908060008090009000209090909090000080605060000000301040909090909090909
-060800000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000700050605000600040801040101070104000002060909090000
-090001000909090009090509090909131301060806030108080009090904090909000906
-060000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000002010504000005040000000003060708060000090901000909090909
-0003060909090909090902010606080C0700090909090909090908000909090909090406
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000002130707070E00090009000109090909090909090807000909090900
-0008090900040809090909090900000609090909090909090400080D1D0F000909000707
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000010009090909070900090909000909090308060500090909
-080909090000050608090909090806050009090909080200081906000802090900090400
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000001000909090504090009000009090909090909090106000909
-0609090909090000020604140604182509011D010604010201000000011A090909100000
-000000000000000000000000000000000000000000000401040500000000000000000000
-000000000000000000000600090009000809000909090909090900000909090206070909
-0105000909090204080C2002000003010700050402070501000909050109040604000000
-000000000000000000000000000000000000030106032626260605000000000000000000
-000000000000000000020800090900040309090909090900090909090909090905060909
-040800070909020000020109090900030707031302070709090000020604070000000000
-000000000000000000000000000000000104262626262626260802000000000000000000
-000000000000000000020105090000010009090909090909090909090909090902080909
-090405000009090900000900090909090000020803000009000909000800000000000000
-000000000002060000000000051708040326262626262626000600000000000000000000
-000000000000000000000401050005040009090909050409000909090009090002080603
-000009090909090106010909090009090900000708000909000905070000000000000000
-00000000010100000000051C040500262626262626002600010000000002000000000000
-00000000000000000000000508081E080400030401070909090909090909000307000408
-040705000006020618090909090909090909090206060909090400000000000000000000
-000000040100000008060000262626262626260007000002060701070408000000000000
-000000000000000000000000000000030807030705090909090909090906170309090909
-0909090909090006080700090900090900090902150B0909060000000000000000000000
-000008080606010605262626260307002626000603000000002626000204000000000000
-00000000001306011C080300000000000000000105090909090906080801000900000000
-000000090900010003010209090909090909080001090908000000000000000000000000
-000800262626262626262626000602262626000800002626262626000406000000000000
-00001701080300040307080400000000000000070608060F0D0209090600090909090909
-09090900032102000008020909090902010E030700070500000000000000000000000003
-0D2626000603262626262626000802262600040500260026262626262601030000000106
-262626262626262626260301040000000000000000030D00090909080009090909090909
-09000706000802000004080106060600020F070006000000000000000000000000000713
-2626262626262626262613010B0826260005030026260026262600262626150804012626
-26000000262626262626262606070000000000000E090009090902010101010101080406
-08050000000100000007000000000000040D06050000000000000000000000000000070E
-0401080800000000040500030D0D07062103000026262626262600002605080026262626
-262626262626262626262626080000000000021309000909090909090909090909090909
-000909090208000008000000000000001502000000000000000000000000000000000201
-040005262626040500260026262600000408070026260026260026260003132626262626
-0400000004012508260026040300000000040E0009090909090909090909090000000909
-090009090504000602000000000000000000000000000000000000000000000000000005
-0401260026030026262626262626010104030806262626262626260004030004040E0601
-0B0813100000000806260001000000000809090909090909090909090002080606080909
-00090909040502060000000000000000000000000000000000000000000000000000000C
-062626262626262626262626262626260604030826260026262602082626000718020000
-040500000107080D0E03160404030403090000090900090909090006080200000E090909
-090009000802070500000000000000000000000000000000000000000000000000051F00
-26262626260026262600040500002626030602082626260026060026262600010000001F
-08060F1108080101110D060C1A0E03090909090909090909090102000000000009090000
-0009000025030802000000000000000000000000000000000000000000000000051E2626
-262626002626002606210807060800000600020600000515070326262605070013010C0F
-08040000260000200F050315041301090909090909000604000000000000000609090909
-090406170500010000000000000000000000000000000000000000000000000013262600
-260026260026260000000000020808190800050700060C19072626000827230C0C262626
-2626262626001F1008011607070802090000000501020000000000000000010600000301
-030206030605000000000000000000000000000000000000000000000000000604262626
-26262626260000000000000000001E0C0F05080215120326000403080403262626262626
-26262626050A060006050606070606060104130000000000000000000001080B12150601
-0D0F04000000000000000000000000000000000000000000000000000000000301010601
-012605040000000000000000031C03000708120600012626000606020026002626262626
-00262605070100060615081E080606070026080000000000000000000706080200000000
-000000000000000000000000000000000000000000000000000000000000000000000705
-000000000000000000000506002626262626260206262600060326262626262626262626
-262600070103040800000706040005082626080000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000130326262626002626012626262608262626262626262626262600
-000008010107030507050003010403042626030000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000103262626002626262606260026260405260026262600262603060801
-010C12031D25131507060400020808262601000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000010726262626262626262626002626000626262626262626082626262626
-0010010D1506161606030800080826260400000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000104002626260026260003262626262603010126262600050626260000002600
-000013020000060501210205142626070000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-0000000001032626260026000326262604281C0500000504260804262600000000262626
-2601262626260800060E0001062608000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000004150726262626260008280300000007032600051326022626262626262626262626
-26262600260800001802021F030100000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-0001010026262626260206262626262626262608041A13000406070704010D2626262626
-262626260505000B1F081A0D040000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-0606042626262626010800262605060808070000081017050000000001020F1107000006
-1C2626000700080126030F0C020000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000003
-080226262600260805040608070000000000000505060000000003062601000508040208
-172600010001012626262626040000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000401
-072626260026150103000000000000000000000601000000000126260300000002080201
-010208000401262626002604020000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000100
-26262626260D000000000000000000000000010100000003062606000000000000080201
-040400060126262600260001000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000004032626
-00262618030000000000000000000000000808000000062626020000000000000008081C
-010001082626260026000700000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000813080500030106
-08071E000000000000000000000000000401000003262604000000000000000000060411
-070711262626002603070000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000601010106000003
-050000000000000000000000000000080100000826080000000000000000000000070112
-021826262600260707000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000526040007262607000000000000000000000000020403
-122626260026040000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000042606000126080000000000000000000000000000000013
-260026262608000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000006260607262603000000000000000000000000000000000D26
-262626060000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000004000826022626060000000000000000000000000000000000122626
-000605000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000070700062606260802000000000000000000000000000000000512000208
-020000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000001050505262626040000000000000000000000000000000000060208060000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000804010226260800000000000000000000000000000000000008011E15000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000071306072607070000000000000000000000000000000000000003081300000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000290326260600000000000000000000000000000000000000000100110700000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000707262604030000000000000000000000000000000000000005262605110000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-0826260E060000000000000000000000000000000000000005040026020F000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000008
-26000F020000000000000000000000000000000000000217032626080200000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000060226
-030400000000000000000000000000000000000000012626261306000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000206262601
-000000000000000000000000000000000000000001262603010500000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000060226070300
-000000000000000000000000000000000000000826020805000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000008262608000000
-000000000000000000000000000000000000170106000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000052626080200000000
-000000000000000000000000000000000004050000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000006260304000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000032626080000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000001260705000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000032626080000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000026260802000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000052603040000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000026260800000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000042607050000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000008260800000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000082626020000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000403260600061303000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000003062626080601030000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000626262626010200000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000062626262600000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000526262608000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000002082626080000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000800260800000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000003
-072626030000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000826
-260400000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000003262601
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000002626040300
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000004260206000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000022626080000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000008260507000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000052626010000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000008262603000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000082626060000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000326260602000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000262603060000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000726000800000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000002262607030000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000262626020600000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000002626050008000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000026260400040500000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000262604000208000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000002626040000010000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000026260400000802000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-030807000008020000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000030807
-000000040500000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000608041D
-011305000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000322
-020000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000A00
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000
-end
-%%PageTrailer
-%%Trailer
-%%EOF
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index a3039d82038..f9f778a7f6f 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
@@ -1,11 +1,12 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hvfloat}[2003/05/31 rotating of floating objects]
+\ProvidesPackage{hvfloat}[2012/03/04 rotating of floating objects]
 %%
 %% IMPORTANT NOTICE:
 %%
 %% This is file `hvfloat.sty',
 %%
 %% Herbert Voss <voss@perce.de>
+%% march 04, 2012
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -15,36 +16,32 @@
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
 \def\fileversion{1.1}
-\def\filedate{2003/05/31}
+\def\filedate{2012/03/04}
 \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
 %
+\newif\ifhv@fbox \hv@fboxfalse
+\DeclareOption{fbox}{\hv@fboxtrue\setlength{\fboxsep}{1pt}}
+\ProcessOptions
 %
 \RequirePackage{graphicx}
 \RequirePackage{keyval}
-\RequirePackage{ifthen}
-%
-\newif\ifhv@fbox \hv@fboxfalse
-\DeclareOption{fbox}{%
-	\hv@fboxtrue%
-	\setlength{\fboxsep}{1pt}%
-}
-\ProcessOptions\relax
+%\RequirePackage{ifthen}
+\RequirePackage{caption}
 %
-\newlength{\hvObjectWidth}
-\newlength{\hvCapWidth}
-\newlength{\hvMaxCapWidth}
-\newsavebox{\hvObjectBox}
-\newsavebox{\hvCaptionBox}
-\newsavebox{\hvOBox}
+\newlength\hvObjectWidth
+\newlength\hvCapWidth
+\newlength\hvMaxCapWidth
+\newsavebox\hvObjectBox
+\newsavebox\hvCaptionBox
+\newsavebox\hvOBox
 %
 \newif\ifhv@useOBox
 \newif\ifhv@nonFloat
 \newif\ifhv@onlyText
-\newif\ifhv@framedCaption
-\newif\ifhv@framedObject
+
+\def\hv@figure{figure}
 %
-\def\hvSet@boolkey#1#2{%
-  \csname hv@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
+\def\hvSet@boolkey#1#2{\csname hv@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
 %
 \define@key{hvSet}{floatPos}[htbp]{	%		LaTeX's position parameters htbp
 	\def\hvSet@floatPos{#1}%
@@ -82,24 +79,14 @@
 \define@key{hvSet}{onlyText}[false]{%		Write the caption only as text
 	\lowercase{\hvSet@boolkey{#1}}{onlyText}%
 }
-\define@key{hvSet}{framedCaption}[false]{%		boxed caption
-	\lowercase{\hvSet@boolkey{#1}}{framedCaption}%
-}
-\define@key{hvSet}{framedObject}[false]{%		boxed object
-	\lowercase{\hvSet@boolkey{#1}}{framedObject}%
-}
 %
-\def\setDefaults{%
+\newcommand{\setDefaults}{%
 \setkeys{hvSet}{%
-	floatPos=htbp, rotAngle=0, capWidth=0.8, capAngle=0,%
+	floatPos=htbp, rotAngle=0, capWidth=.8, capAngle=0,%
 	capPos=b, capVPos=c, objectPos=c, objectAngle=0,%
 	floatCapSep=5, useOBox=false, nonFloat=false,%
 	onlyText=false}%
 }
-\setDefaults%
-\ifhv@fbox
-	\setkeys{hvSet}{framedCaption=true, framedObject=true}%
-\fi
 %
 \def\hv@Top{t}
 \def\hv@Bottom{b}
@@ -120,26 +107,26 @@
 	\setlength{\belowcaptionskip}{0pt}
 }
 \newcommand{\restoreCaptionSkip}{%
-	\setlength{\abovecaptionskip}{\hvAboveCaptionSkip}
-	\setlength{\belowcaptionskip}{\hvBelowCaptionSkip}
+  \setlength\abovecaptionskip{\hvAboveCaptionSkip}
+  \setlength\belowcaptionskip{\hvBelowCaptionSkip}
 }
 %
 %
 \newcommand{\figcaption}[2][]{\def\@captype{figure}%
-	\ifthenelse{\equal{#1}{}}{\caption{#2}}{\caption[#1]{#2}}}
+  \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi}
 \newcommand{\tabcaption}[2][]{\def\@captype{table}%
-	\ifthenelse{\equal{#1}{}}{\caption{#2}}{\caption[#1]{#2}}}
+  \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi}
 %
 %
 %
 \def\hvFloat{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}}
 \def\do@hvFloat[#1]#2#3{%
-	\setDefaults%
-	\ifthenelse{\equal{#1}{}}{}{\setkeys{hvSet}{#1}}%
-	\gdef\hv@floatType{#2}%
-	\ifthenelse{\equal{#2}{}}{\setkeys{hvSet}{nonFloat=true}}{}%
-	\gdef\hv@floatObject{#3}%
-	\@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}%
+  \setDefaults%
+  \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi%
+  \gdef\hv@floatType{#2}%
+  \ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi%
+  \gdef\hv@floatObject{#3}%
+  \@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}%
 }
 \def\do@@hvFloat[#1]#2#3{%
 	\def\hv@shortCap{#1}
@@ -152,160 +139,129 @@
 % [#4]: short caption
 % #5: caption
 % #6: label
-%	\setDefaults%
-%	\def\@tempa{#1}%
-%	\ifx\@tempa\empty\else\setkeys{hvSet}{#1}\fi% set options, only when not empty
-	\def\@tempa{90}%
-	\ifx\hvSet@rotAngle\@tempa
-		\setlength{\hvMaxCapWidth}{\textheight}
-	\else
-		\setlength{\hvMaxCapWidth}{\linewidth}
-	\fi
+% \setDefaults%
+% \def\@tempa{#1}%
+% \ifx\@tempa\empty\else\setkeys{hvSet}{#1}\fi% set options, only when not empty
+  \def\@tempa{90}%
+  \ifx\hvSet@rotAngle\@tempa \setlength{\hvMaxCapWidth}{\textheight}
+  \else                      \setlength{\hvMaxCapWidth}{\linewidth}
+  \fi
 %
 % First we save the object in \hvObjectBox
 %
-	\ifx\hvSet@objectAngle\hv@Zero % rotate the object?
-		\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}
-	\else
-		\savebox{\hvObjectBox}{%
-			\rotatebox{\hvSet@objectAngle}{%
-				\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}}
-	\fi
-	\setlength{\hvObjectWidth}{\wd\hvObjectBox}
+  \ifx\hvSet@objectAngle\hv@Zero % rotate the object?
+    \savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}
+  \else
+    \savebox{\hvObjectBox}{%
+    \rotatebox{\hvSet@objectAngle}{%
+    \ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}}
+  \fi
+  \setlength{\hvObjectWidth}{\wd\hvObjectBox}
 %
 % Now we save the caption with its defined \hvCapWidth
 %
-	\ifx\hvSet@capWidth\hv@Width
-		\setlength{\hvCapWidth}{\hvObjectWidth}
-	\else
-		\ifx\hvSet@capWidth\hv@Height
-			\setlength{\hvCapWidth}{\ht\hvObjectBox}
-		\else
-			\setlength{\hvCapWidth}{\hvObjectWidth}
-			\ifx\hvSet@capPos\hv@Left
-				\addtolength{\hvMaxCapWidth}{-\hvObjectWidth}
-			\fi
-			\ifx\hvSet@capPos\hv@Right
-				\addtolength{\hvMaxCapWidth}{-\hvObjectWidth}
-			\fi
-			\ifdim\hvSet@capWidth\columnwidth<\hvMaxCapWidth
-				\setlength{\hvCapWidth}{\hvSet@capWidth\columnwidth}
-			\else
-				\setlength{\hvCapWidth}{\hvMaxCapWidth}
-			\fi
-		\fi
-	\fi
+  \ifx\hvSet@capWidth\hv@Width\setlength{\hvCapWidth}{\hvObjectWidth}
+  \else
+    \ifx\hvSet@capWidth\hv@Height\setlength{\hvCapWidth}{\ht\hvObjectBox}
+    \else
+      \setlength{\hvCapWidth}{\hvObjectWidth}
+      \ifx\hvSet@capPos\hv@Left\addtolength{\hvMaxCapWidth}{-\hvObjectWidth}\fi
+      \ifx\hvSet@capPos\hv@Right\addtolength{\hvMaxCapWidth}{-\hvObjectWidth}\fi
+      \ifdim\hvSet@capWidth\columnwidth<\hvMaxCapWidth
+	\setlength{\hvCapWidth}{\hvSet@capWidth\columnwidth}
+      \else
+	\setlength{\hvCapWidth}{\hvMaxCapWidth}
+      \fi
+    \fi
+  \fi
 %
 % now we have the object and the caption with the right
 % rotated angles saved in boxes
 %
-	\def\fps@figure{\hvSet@floatPos}
-	\ifhv@nonFloat%
-		\begingroup%	Start the nonfloat part
-	\else%
-		\begin{\hv@floatType}%		Start the floating environment
+  \def\fps@figure{\hvSet@floatPos}
+  \ifhv@nonFloat\begingroup%	Start the nonfloat part
+  \else         \begin{\hv@floatType}%		Start the floating environment
+  \fi%
+  \saveCaptionSkip% we put this space ourselve
+  \ifx\hvSet@capAngle\hv@Width % need rotation?
+    \sbox{\hvCaptionBox}{%
+      \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
+        \ifhv@nonFloat%
+	  \ifhv@onlyText#2%
+  	  \else%
+	    \ifx\hv@floatType\hv@figure
+	      \ifx\relax#1\relax \figcaption{#2}\else\figcaption[#1]{#2}\fi
+	    \else
+	      \ifx\relax#1\relax \tabcaption{#2}\else\tabcaption[#1]{#2}\fi%
+	    \fi
+	  \fi
+	\else\ifx\relax\hv@shortCap\relax\caption{#2}\else\caption[#1]{#2}\fi%
 	\fi%
-		\saveCaptionSkip% we put this space ourselve
-		\ifx\hvSet@capAngle\hv@Width % need rotation?
-			\sbox{\hvCaptionBox}{%
-				\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
-					\ifhv@nonFloat%
-						\ifhv@onlyText%
-							#2%
-						\else%
-						    \ifthenelse{\equal{\hv@floatType}{figure}}{%
-							\ifthenelse{\equal{#1}{}}{\figcaption{#2}}{\figcaption[#1]{#2}}%
-						    }{%
-							\ifthenelse{\equal{#1}{}}{\tabcaption{#2}}{\tabcaption[#1]{#2}}%
-						    }%
-						\fi%
-					\else%
-						\ifx\hv@shortCap\empty\caption{#2}\else\caption[#1]{#2}\fi%
-					\fi%
-					\label{#3}%
-				\end{minipage}%
-			}%
-		\else%
-			\sbox{\hvCaptionBox}{%
-				\rotatebox{\hvSet@capAngle}{%
-					\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
-						\ifhv@nonFloat%
-							\ifhv@onlyText%
-								#2%
-							\else%
-							    \ifthenelse{\equal{\hv@floatType}{figure}}{%
-								\ifthenelse{\equal{#1}{}}{\figcaption{#2}}{\figcaption[#1]{#2}}%
-							    }{%
-								\ifthenelse{\equal{#1}{}}{\tabcaption{#2}}{\tabcaption[#1]{#2}}%
-							    }%
-							\fi%
-						\else%
-							\ifx\hv@shortCap\empty\caption{#2}\else\caption[#1]{#2}\fi%
-						\fi%
-						\label{#3}%
-					\end{minipage}%
-				}%
-			}%
-		\fi%
+	\label{#3}%
+      \end{minipage}%
+    }%
+  \else%
+    \sbox{\hvCaptionBox}{%
+      \rotatebox{\hvSet@capAngle}{%
+      \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
+	\ifhv@nonFloat%
+  	  \ifhv@onlyText#2%
+  	  \else%
+	    \ifx\hv@floatType\hv@figure 
+	      \ifx\relax#1\relax \figcaption{#2}\else\figcaption[#1]{#2}\fi
+	    \else
+	      \ifx\relax#1\relax \tabcaption{#2}\else\tabcaption[#1]{#2}\fi%
+	    \fi
+	  \fi
+	\else\ifx\relax\hv@shortCap\relax\caption{#2}\else\caption[#1]{#2}\fi%
+        \fi%
+        \label{#3}%
+      \end{minipage}%
+      }%
+    }%
+  \fi%
 %%
-		\restoreCaptionSkip% save old values
-		\ifx\hvSet@objectPos\hv@Right%
-			\raggedleft%
-		\else%
-			\ifx\hvSet@objectPos\hv@Center%
-				\ifhv@nonFloat%
-					\hspace*{\fill}%
-				\else%
-					\centering
-				\fi%
-			\fi%
-		\fi%
+  \restoreCaptionSkip% save old values
+  \ifx\hvSet@objectPos\hv@Right\raggedleft%
+  \else%
+    \ifx\hvSet@objectPos\hv@Center
+      \ifhv@nonFloat\hspace*{\fill}\else\centering\fi%
+    \fi%
+  \fi%
 %
 % to rotate object and caption together, we save all in another box
 % the caption comes first, if its on the left or the top
 %
-		\savebox{\@tempboxa}{%
-			\ifx\hvSet@capPos\hv@Left  %  caption on left side
-				\ifx\hvSet@capVPos\hv@Center%
-					\ifhv@framedCaption%
-						\fbox{\parbox{\wd\hvCaptionBox}{\usebox{\hvCaptionBox}}}%
-					\else
-						\parbox{\wd\hvCaptionBox}{\usebox{\hvCaptionBox}}
-					\fi%
-		        	\hspace{\hvSet@floatCapSep pt}% capfloatsep
-					\ifhv@framedObject%
-						\fbox{\parbox{\wd\hvObjectBox}{\usebox{\hvObjectBox}}}
-					\else
-						\parbox{\wd\hvObjectBox}{\usebox{\hvObjectBox}}
-					\fi%
-				\else%
-					\ifx\hvSet@capVPos\hv@Top % caption at top
-						\ifhv@framedCaption%
-							\fbox{\raisebox{-\height}{\usebox{\hvCaptionBox}}}%
-						\else
-							\raisebox{-\height}{\usebox{\hvCaptionBox}}%
-						\fi
-						\hspace{\hvSet@floatCapSep pt}% capfloatsep
-						\ifhv@framedObject%
-							\fbox{\raisebox{-\height}{\usebox{\hvObjectBox}}}%
-						\else
-							\raisebox{-\height}{\usebox{\hvObjectBox}}%
-						\fi%
-					\else% caption on bottom
-						\ifhv@framedCaption%
-							\fbox{\usebox{\hvCaptionBox}}
-						\else
-							\usebox{\hvCaptionBox}
-						\fi%
-						\hspace{\hvSet@floatCapSep pt}%
-						\ifhv@framedObject%
-							\fbox{\usebox{\hvObjectBox}}
-						\else
-							\usebox{\hvObjectBox}
-						\fi%
-					\fi%
-				\fi%
-			\else
+  \savebox{\@tempboxa}{%
+  \ifx\hvSet@capPos\hv@Left  %  caption on left side
+    \ifx\hvSet@capVPos\hv@Center%
+      \ifhv@fbox\fbox{\parbox{\wd\hvCaptionBox}{\usebox{\hvCaptionBox}}}%
+      \else     \parbox{\wd\hvCaptionBox}{\usebox{\hvCaptionBox}}%
+      \fi%
+    \hspace{\hvSet@floatCapSep pt}% capfloatsep
+    \ifhv@fbox\fbox{\parbox{\wd\hvObjectBox}{\usebox{\hvObjectBox}}}
+    \else     \parbox{\wd\hvObjectBox}{\usebox{\hvObjectBox}}
+    \fi%
+  \else%
+    \ifx\hvSet@capVPos\hv@Top % caption at top
+      \ifhv@fbox\fbox{\raisebox{-\height}{\usebox{\hvCaptionBox}}}%
+      \else     \raisebox{-\height}{\usebox{\hvCaptionBox}}%
+      \fi
+      \hspace{\hvSet@floatCapSep pt}% capfloatsep
+      \ifhv@fbox\fbox{\raisebox{-\height}{\usebox{\hvObjectBox}}}%
+      \else     \raisebox{-\height}{\usebox{\hvObjectBox}}%
+      \fi%
+    \else% caption on bottom
+      \ifhv@fbox\fbox{\usebox{\hvCaptionBox}}
+                \else\usebox{\hvCaptionBox}
+      \fi%
+      \hspace{\hvSet@floatCapSep pt}%
+      \ifhv@fbox\fbox{\usebox{\hvObjectBox}}
+      \else     \usebox{\hvObjectBox}
+      \fi%
+    \fi%
+  \fi%
+  \else
 				\ifx\hvSet@capPos\hv@Top
 					\ifdim\wd\hvCaptionBox>\wd\hvObjectBox
 						\begin{minipage}{\wd\hvCaptionBox}
@@ -313,15 +269,12 @@
 						\begin{minipage}{\wd\hvObjectBox}
 					\fi
 					\centering
-					\ifhv@framedCaption%
+					\ifhv@fbox
 						\fbox{\usebox{\hvCaptionBox}}\\[\hvBelowCaptionSkip]
+						\fbox{\usebox{\hvObjectBox}}
 					\else
-						\usebox{\hvCaptionBox}\\[\hvBelowCaptionSkip]%
-					\fi%
-					\ifhv@framedObject%
-						\fbox{\usebox{\hvObjectBox}}%
-					\else
-						\usebox{\hvObjectBox}%
+						\usebox{\hvCaptionBox}\\[\hvBelowCaptionSkip]
+						\usebox{\hvObjectBox}
 					\fi%
 					\end{minipage}
 				\else
@@ -332,51 +285,48 @@
 							\begin{minipage}{\wd\hvObjectBox}
 						\fi
 						\centering
-						\ifhv@framedObject
+						\ifhv@fbox
 							\fbox{\usebox{\hvObjectBox}}\\[\hvAboveCaptionSkip]
+							\fbox{\usebox{\hvCaptionBox}}
 						\else
 							\usebox{\hvObjectBox}\\[\hvAboveCaptionSkip]
-						\fi%
-						\ifhv@framedCaption
-							\fbox{\usebox{\hvCaptionBox}}%
-						\else
-							\usebox{\hvCaptionBox}%
+							\usebox{\hvCaptionBox}
 						\fi%
 						\end{minipage}
 					\else% the last option: put the caption on the right
 						\ifx\hvSet@capVPos\hv@Center%
-							\ifhv@framedObject
+							\ifhv@fbox
 								\fbox{\parbox{\wd\hvObjectBox}{\usebox{\hvObjectBox}}}
 							\else
 								\parbox{\wd\hvObjectBox}{\usebox{\hvObjectBox}}
 							\fi%
 							\hspace{\hvSet@floatCapSep pt}%
-							\ifhv@framedCaption
+							\ifhv@fbox
 								\fbox{\parbox{\wd\hvCaptionBox}{\usebox{\hvCaptionBox}}}%
 							\else
 								\parbox{\wd\hvCaptionBox}{\usebox{\hvCaptionBox}}
 							\fi%
 						\else%
 							\ifx\hvSet@capVPos\hv@Top
-								\ifhv@framedObject
+								\ifhv@fbox
 									\fbox{\raisebox{-\height}{\usebox{\hvObjectBox}}}%
 								\else
 									\raisebox{-\height}{\usebox{\hvObjectBox}}%
 								\fi%
 								\hspace{\hvSet@floatCapSep pt}%
-								\ifhv@framedCaption
+								\ifhv@fbox
 									\fbox{\raisebox{-\height}{\usebox{\hvCaptionBox}}}%
 								\else
 									\raisebox{-\height}{\usebox{\hvCaptionBox}}%
 								\fi
 							\else
-								\ifhv@framedObject
+								\ifhv@fbox
 									\fbox{\usebox{\hvObjectBox}}%
 								\else
 									\usebox{\hvObjectBox}%
 								\fi
 								\hspace{\hvSet@floatCapSep pt}%
-								\ifhv@framedCaption
+								\ifhv@fbox
 									\fbox{\usebox{\hvCaptionBox}}%
 								\else
 									\usebox{\hvCaptionBox}%
@@ -405,9 +355,10 @@
 	\else
 		\end{\hv@floatType}%	End the floating environment
 	\fi
-	\ifhv@fbox % reset local settings
-	    \setkeys{hvSet}{framedCaption=true, framedObject=true}
-	\fi
 }
 %
+\newenvironment{hvFloatEnv}[1][\textwidth]
+  {\minipage{#1}\center}
+  {\endcenter\endminipage}
+%
 \endinput