texlive[59069] Master/texmf-dist: hvfloat (3may21)

commits+karl at tug.org commits+karl at tug.org
Mon May 3 23:12:40 CEST 2021


Revision: 59069
          http://tug.org/svn/texlive?view=revision&revision=59069
Author:   karl
Date:     2021-05-03 23:12:40 +0200 (Mon, 03 May 2021)
Log Message:
-----------
hvfloat (3may21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
    trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
    trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2021-05-03 21:12:19 UTC (rev 59068)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2021-05-03 21:12:40 UTC (rev 59069)
@@ -1,4 +1,5 @@
 hvfloat.sty:    
+2.21  2021-05-04  - fix for several bugs (onlyText, spaces,...)
 2.20  2021-04-29  - use better macronames for setting the defaults
                     and defining an own style
 2.19  2021-03-15  - fix for vertical spacing of doubleFULLPAGE

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex	2021-05-03 21:12:19 UTC (rev 59068)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex	2021-05-03 21:12:40 UTC (rev 59069)
@@ -1,7 +1,7 @@
-%% $Id: hvfloat.tex 56 2021-03-15 07:20:37Z herbert $
+%% $Id: hvfloat.tex 73 2021-05-03 07:38:13Z herbert $
 \listfiles
 \errorcontextlines=100
-\documentclass[twoside,paper=a4]{scrartcl}
+\documentclass[twoside,paper=a4,]{scrartcl}
 \usepackage{fontspec}
 \usepackage{libertinus}
 %\usepackage[scaled=0.85]{beramono}
@@ -305,7 +305,8 @@
 \endfoot
 \bottomrule
 \endlastfoot
-\Lkeyword{floatPos} & \texttt{htb} & This is \emph{not} the same default placement setting like the one from the floats.\\
+\Lkeyword{floatPos} & \texttt{tbp} & This is the same default placement setting like the one from standard \LaTeX, but maybe not always
+the best setting.\\
 \Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption should be rotated in the same way.\\
 
 \Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width, 
@@ -313,10 +314,12 @@
 
 \Lkeyword{capAngle} & 0 & The value for the angle if the caption should be rotated. Counted anti clockwise.\\
 
-\Lkeyword{capPos} & before& The position of the caption relative to the object. Possible values are\\ 
+\Lkeyword{capPos} & bottom& The position of the caption relative to the object. Possible values are\\ 
                   &       & \Lkeyval{before}: \emph{always} before (left) from the object.\\
+                  &       & \Lkeyval{top}: \emph{always} on top of  the object.\\
                   &       & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\
                   &       & \Lkeyval{after}: \emph{always} after (right) from the object.\\
+                  &       & \Lkeyval{bottom}: \emph{always} on the bottom of the object.\\
                   &       & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\
                   &       & \Lkeyval{inner}: in \Index{twoside} mode always typeset at the inner margin.\\
                   &       & \Lkeyval{outer}: in \Index{twoside} mode always typeset at the outer margin.\\
@@ -323,7 +326,7 @@
                   &       & \Lkeyval{evenPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an even page.\\
                   &       & \Lkeyval{oddPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an odd page.\\
 
-\Lkeyword{capVPos}& c& This is only important for \texttt{capPos=left|right}. Only in this case the 
+\Lkeyword{capVPos}& center& This is only important for \texttt{capPos=left|right}. Only in this case the 
     caption can vertically placed at the \Lkeyval{bottom}, \Lkeyval{center} and \Lkeyval{top}.\\
 
 \Lkeyword{objectPos} & center & The horizontalplacement of the object relative to the document. Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\
@@ -335,6 +338,8 @@
 
 \Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \Lcs{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\
 
+\Lkeyword{onlyText} & false & The caption will be printed as normal text and there is no entry in the list of \ldots.\\
+
 \Lkeyword{nonFloat} & 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.\\
 
 \Lkeyword{wide} & false & The float can use \Ldim{textwidth}+\Ldim{marginparwidth} as horizontal width.\\
@@ -2479,7 +2484,7 @@
 \begin{lstlisting}
 \Blindtext
 
-\hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
+\hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]%
   {figure}%
   {\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}%
   [Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
@@ -2495,7 +2500,7 @@
 
 \Blindtext
 \marginnote{Fig.~\ref{fig:doubleFULLPAGE0}}
- \hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
+ \hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]%
   {figure}%
   {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}%
   [Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
@@ -2514,7 +2519,7 @@
 \begin{lstlisting}
 \Blindtext 
 
- \hvFloat[doubleFULLPAGE,capPos=r]%
+ \hvFloat[doubleFULLPAGE,capPos=right]%
   {figure}%
   {\includegraphics[height=\paperheight]{images/rheinsberg}}%
   {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
@@ -2529,7 +2534,7 @@
 
 \marginnote{Fig.~\ref{fig:doubleFULLPAGE1}}
 
- \hvFloat[doubleFULLPAGE,capPos=r]%
+ \hvFloat[doubleFULLPAGE,capPos=right]%
   {figure}%
   {\includegraphics[height=\paperheight]{images/rheinsberg}}%
   {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
@@ -2589,7 +2594,7 @@
 \begin{lstlisting}
 \Blindtext
 
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
   {figure}%
   {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
   [Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
@@ -2606,7 +2611,7 @@
 \Blindtext
 
 \marginnote{Fig. \ref{fig:doublePage0}}
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
   {figure}%
   {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
   [Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
@@ -2659,7 +2664,7 @@
 \bottomrule
 \end{tabular}}
 
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
   {table}%
   {\usebox\hvOBox}%%%%%%%%%%%%%%
   [Eine doppelseitige Tabelle mit rechtsseitiger Caption unterhalb]%
@@ -2703,7 +2708,7 @@
 \bottomrule
 \end{tabular}}
 
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
   {table}%
   {\usebox\hvOBox}%%%%%%%%%%%%%%
   [Eine doppelseitige Tabelle mit rechtsseitiger Caption unterhalb]%
@@ -2741,7 +2746,7 @@
 
 The label \texttt{demo:fullpage} is used for the \emph{image} and not for the caption! Internally another label
 called \texttt{demo:fullpage-cap}  is set on the caption page which can be before or
-behind the opject (depending to the optional argument of \Lkeyword{capPos}).
+behind the object (depending to the optional argument of \Lkeyword{capPos}).
 For example:
 
 \begin{verbatim}

Added: trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt	2021-05-03 21:12:40 UTC (rev 59069)
@@ -0,0 +1,3 @@
+Not all imaging of the documentation are listed here, because
+some are not for public use. You can use any other imgae if you
+want to run the documentation by yourselve.


Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2021-05-03 21:12:19 UTC (rev 59068)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2021-05-03 21:12:40 UTC (rev 59069)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 56 2021-03-15 07:20:37Z herbert $
+%% $Id: hvfloat.sty 73 2021-05-03 07:38:13Z herbert $
 %%
 %%
 %% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.20}
-\def\filedate{2021/04/29}
+\def\fileversion{2.21}
+\def\filedate{2021/05/04}
 \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
 \ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
 \let\hvFloatFileVersion\fileversion
@@ -87,7 +87,7 @@
 %
 \def\hv at figure{figure}
 %
-\define at key{hvSet}{floatPos}[htbp]{%		LaTeX's position parameters htbp
+\define at key{hvSet}{floatPos}[tbp]{%		LaTeX's position parameters htbp
 	\def\hvSet at floatPos{#1}%
 }
 \define at key{hvSet}{rotAngle}[0]{%		rotates caption AND image together
@@ -99,25 +99,45 @@
 \define at key{hvSet}{capAngle}[0]{%		-360..+360
 	\def\hvSet at capAngle{#1}%
 }
-\define at key{hvSet}{capPos}[bottom]{%			(l)eft|(b)ottom|(t)op|(r)ight|(i)nner|(o)uter|(e)ven|o(d)d
+
+ 
+\define at choicekey*+{hvSet}{capPos}[\val\nr]{bottom,top,left,before,right,after,inner,outer,even,odd}[bottom]{% 
   \def\hvSet at capPos{#1}%			it is relativ to the object, (e),(d) only valid for fullpage float
-  \edef\@tempa{#1}%
-  \ifx\hv at Bottom\@tempa 
+  \ifcase\nr\relax
     \hv at capbesidefalse
+  \or
+    \hv at capbesidefalse
   \else
-    \ifx\hv at Top\@tempa
-      \hv at capbesidefalse
-    \else
-      \hv at capbesidetrue
-    \fi
+    \hv at capbesidetrue
   \fi
-}
-\define at key{hvSet}{capVPos}[center]{%		bottom|center|top
-	\def\hvSet at capVPos{#1}%			it is relativ to the object
-}
-\define at key{hvSet}{objectPos}[center]{%		(l)eft|(c)enter|(r)ight|(i)nner|(o)uter
-	\def\hvSet at objectPos{#1}%		it is relativ to the document
-}
+}{\PackageWarning{hvfloat}{erroneous input (#1) for capPos ignored. Using bottom.}%
+  \def\hvSet at capPos{bottom}%			it is relativ to the object, (e),(d) only valid for fullpage float
+  \hv at capbesidefalse
+ }
+ 
+\define at choicekey*+{hvSet}{capVPos}[\val\nr]{bottom,center,top}[center]{% 
+  \def\hvSet at capVPos{#1}%			it is relativ to the object
+}{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using bottom.}%
+  \def\hvSet at capVPos{center}%			it is relativ to the object
+ }
+
+\define at choicekey*+{hvSet}{objectPos}[\val\nr]{left,center,right,inner,outer}[center]{% 
+  \def\hvSet at objectPos{#1}%			it is relativ to the object
+}{\PackageWarning{hvfloat}{erroneous input (#1) for objectPos ignored. Using center.}%
+  \def\hvSet at capVPos{center}%			it is relativ to the object
+ }
+
+\newif\ifhv at floatRefToObject
+\define at choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{%   where the LOF entry should point to 
+  \ifcase\nr\relax
+    \hv at floatRefToObjectfalse
+  \else
+    \hv at floatRefToObjecttrue
+  \fi
+}{\PackageWarning{hvfloat}{erroneous input (#1) for floatRef ignored. Using option object.}%
+    \hv at floatRefToObjecttrue
+ }
+
 \define at key{hvSet}{objectAngle}[0]{%		-360..+360
 	\def\hvSet at objectAngle{#1}%
 }
@@ -177,7 +197,8 @@
 	doubleFULLPAGE=false, doublePage=false, doublePAGE=false,
         multiFloat=false,subFloat=false,
 	separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip,
-	capFormat={}, subcapFormat={},
+	capFormat={}, subcapFormat={}, 
+	floatRef=object,
 }%
 }
 
@@ -201,10 +222,10 @@
 }
 \setlength\belowcaptionskip{\abovecaptionskip}% it is in latex.ltx = 0pt
 \newcommand\saveCaptionSkip{%
-	\setlength{\hvAboveCaptionSkip}{\abovecaptionskip}
-	\setlength{\hvBelowCaptionSkip}{\belowcaptionskip}
-	\setlength{\abovecaptionskip}{0pt}
-	\setlength{\belowcaptionskip}{0pt}
+	\setlength{\hvAboveCaptionSkip}{\abovecaptionskip}%
+	\setlength{\hvBelowCaptionSkip}{\belowcaptionskip}%
+	\setlength{\abovecaptionskip}{0pt}%
+	\setlength{\belowcaptionskip}{0pt}%
 }
 \newcommand{\restoreCaptionSkip}{%
   \setlength\abovecaptionskip{\hvAboveCaptionSkip}%
@@ -311,7 +332,8 @@
 \def\hvFloat at i*{\@ifnextchar[{\do at hvFloat}{\do at hvFloat[]}}
 \def\do at hvFloat[#1]{%
   \begingroup
-  \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
+  \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}%
+%  \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
   \hv at maxImageWidth=\textwidth
   \reset at special@float
   \setcounter{hv at pfigure}{\value{figure}}%
@@ -319,7 +341,8 @@
   \gdef\hv at save@setting{#1}%
   \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
   \gdef\hv at floatType{figure}%
-  \@ifnextchar+{\do at multiFloat}{\hvFloat at ii[#1]}}
+  \@ifnextchar+{\do at multiFloat}{\hvFloat at ii[#1]}%
+}
 
 \ExplSyntaxOn
 
@@ -381,15 +404,28 @@
 \newcount\hv at cnta
 \newcount\hv at cntb
 
+\def\hvFloat at ii[#1]#2{%     #1: key/value, #2: floattype
+  \@ifnextchar[{\hvFloat at iii[#1]{#2}}{\hvFloat at iii[#1]{#2}[]}%
+}
 
-\def\hvFloat at ii[#1]#2#3{%
+\def\hvFloat at iii[#1]#2[#3]#4{%     #1: key/value, #2: floattype, #3: ListOfExt, #4: object
   \hv at maxImageWidth=\textwidth
   \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
   \gdef\hv at floatType{#2}%
+  \ifx\relax#3\relax
+    \ifx\hv at floatType\hv at figure
+      \gdef\hv at floatListOfExt{lof}%
+    \else    
+      \gdef\hv at floatListOfExt{lot}%
+    \fi
+  \else
+    \gdef\hv at floatListOfExt{#3}%
+  \fi
   \ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi
-  \gdef\hv at floatObject{#3}%
+  \gdef\hv at floatObject{#4}%
   \@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}%
 }
+
 \def\do@@hvFloat[#1]#2#3{%
   \gdef\hv at shortCap{#1}%
   \gdef\hv at longCap{#2}%
@@ -404,7 +440,7 @@
       \do@@@@hvFloat%  fullpage with caption on other page
     \else
       \ifhv at doubleFULLPAGE
-        \setlength\hvCapWidth{\textheight}
+        \setlength\hvCapWidth{\textheight}%
         \expandafter\do at hvFloat@doubleFULLPAGE\@@temp%  fullpage with caption rotated or under on an odd page
       \else
         \ifhv at doublePAGE
@@ -432,7 +468,7 @@
 %
 % First we save the object in \hvObjectBox
 %
-  \ifx\hvSet at objectAngle\hv at Zero % rotate the object?
+  \ifx\hvSet at objectAngle\hv at Zero% rotate the object?
     \savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
   \else
     \savebox{\hvObjectBox}{%
@@ -485,15 +521,16 @@
           \fi
         \fi
       \fi
-    \fi    
-  \fi 
-  \saveCaptionSkip			% we put this space ourselve
-  \ifx\hvSet at capAngle\hv at Zero 		% need rotation?
+    \fi
+  \fi
+  \saveCaptionSkip% we put this space ourselve
+  \ifx\hvSet at capAngle\hv at Zero% need rotation?
     \savebox\hvCaptionBox{%   NO rotation
       \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
 	\ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
         \ifhv at nonFloat
-	  \ifhv at onlyText\hv at longCap
+	  \ifhv at onlyText
+	    \hv at longCap
   	  \else
 	    \ifx\hv at floatType\hv at figure
 	      \ifx\relax\hv at shortCap\relax 
@@ -510,11 +547,25 @@
 	    \fi
 	  \fi
 	\else
-          \let\@captype\hv at floatType
-          \expandafter\ifx\expandafter\relax\hv at shortCap\relax 
-            \caption{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
-          \else
-            \caption[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+	  \ifhv at onlyText
+	    \hv at longCap
+  	  \else
+            \let\@captype\hv at floatType
+            \ifhv at floatRefToObject
+              \expandafter\ifx\expandafter\relax\hv at shortCap\relax 
+                \caption[]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+                \addcontentsline{\hv at floatListOfExt}{\hv at floatType}{\protect\numberline{\csname the\hv at floatType\endcsname}{\ignorespaces\hv at longCap}}%
+              \else
+                \caption[]{\hv at shortCap\expandafter\label\expandafter{\hv at label}}%
+                \addcontentsline{\hv at floatListOfExt}{\hv at floatType}{\protect\numberline{\csname the\hv at floatType\endcsname}{\ignorespaces\hv at shortCap}}%
+              \fi
+            \else
+              \expandafter\ifx\expandafter\relax\hv at shortCap\relax 
+                \caption{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+              \else
+                \caption[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+              \fi
+            \fi
           \fi
 	\fi
 %	\expandafter\label\expandafter{\hv at label}%   2.17 put label into the caption argument
@@ -526,19 +577,37 @@
         \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
  	  \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
   	  \ifhv at nonFloat
-  	    \ifhv at onlyText\hv at longCap
-  	  \else
-	    \ifx\hv at floatType\hv at figure 
-	      \ifx\relax\hv at shortCap\relax \figcaption{\hv at longCap}\else\figcaption[\hv at shortCap]{\hv at longCap}\fi
-	    \else
-	      \ifx\relax\hv at shortCap\relax \tabcaption{\hv at longCap}\else\tabcaption[\hv at shortCap]{\hv at longCap}\fi
+  	    \ifhv at onlyText
+  	      \hv at longCap
+            \else
+	      \ifx\hv at floatType\hv at figure 
+	        \ifx\relax\hv at shortCap\relax \figcaption{\hv at longCap}\else\figcaption[\hv at shortCap]{\hv at longCap}\fi
+	      \else
+	        \ifx\relax\hv at shortCap\relax \tabcaption{\hv at longCap}\else\tabcaption[\hv at shortCap]{\hv at longCap}\fi
+	      \fi
 	    \fi
-	  \fi
-	\else
-          \let\@captype\hv at floatType
-          \expandafter\ifx\expandafter\relax\hv at shortCap\relax \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}\fi
-        \fi
-        \label{\hv at label}%
+	  \else
+  	    \ifhv at onlyText
+  	      \hv at longCap
+            \else
+              \let\@captype\hv at floatType
+              \ifhv at floatRefToObject
+                \expandafter\ifx\expandafter\relax\hv at shortCap\relax 
+                  \caption[]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+                  \addcontentsline{\hv at floatListOfExt}{\hv at floatType}{\protect\numberline{\csname the\hv at floatType\endcsname}{\ignorespaces\hv at longCap}}%
+                \else
+                  \caption[]{\hv at shortCap\expandafter\label\expandafter{\hv at label}}%
+                  \addcontentsline{\hv at floatListOfExt}{\hv at floatType}{\protect\numberline{\csname the\hv at floatType\endcsname}{\ignorespaces\hv at shortCap}}%
+                \fi
+              \else
+                \expandafter\ifx\expandafter\relax\hv at shortCap\relax 
+                  \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}%
+                \fi
+              \fi
+%          \expandafter\ifx\expandafter\relax\hv at shortCap\relax \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}\fi
+            \fi
+          \fi
+          \label{\hv at label}%
         \end{minipage}%
       }%  rotatebox
     }%  \sbox
@@ -555,7 +624,7 @@
     \ifhv at star 
       \@nameuse{\hv at floatType*}%		Start the floating environment *****************************
     \else
-      \begin{\hv at floatType} %		Start the floating environment
+      \begin{\hv at floatType}%		Start the floating environment
     \fi
   \fi
   \checkoddpage
@@ -596,10 +665,10 @@
               \ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi
             \else 
               \ifx\hvSet at capPos\hv at Before
-                \hv@@capPos=0 % same as cappos=right
+                \hv@@capPos=0% same as cappos=right
               \else
                 \ifx\hvSet at capPos\hv at After
-                  \hv@@capPos=2 % same as capPos=right
+                  \hv@@capPos=2% same as capPos=right
                 \fi
               \fi
             \fi
@@ -641,7 +710,7 @@
 	\usebox{\hvObjectBox}%
       \fi
       \end{minipage}%
-    \or   %2 is right
+    \or%2 is right
       \ifx\hvSet at capVPos\hv at Center
         \put at ObjectBox
 	\hspace{\hvSet at floatCapSep}%
@@ -657,7 +726,7 @@
           \put at CaptionBox[2]%
 	\fi
       \fi
-    \or %3 bottom
+    \or%3 bottom
       \ifdim\wd\hvCaptionBox>\wd\hvObjectBox
         \begin{minipage}{\wd\hvCaptionBox}%
       \else
@@ -678,7 +747,7 @@
 % now we rotate the object and caption, if needed
 %
   \ifhv at wide
-    \ifoddpageoroneside\else\ifoddpage\else\hspace*{-\marginparwidth}\fi\fi%   <- for wide and left page
+    \ifoddpageoroneside\else\ifoddpage\else\hspace*{\dimexpr-\marginparwidth-\marginparsep}\fi\fi%   <- for wide and left page
   \fi
   \ifx\hvSet at rotAngle\hv at Zero
     \usebox{\@tempboxa}%
@@ -726,9 +795,9 @@
         \else
           \ifx\hvSet at capPos\hv at Outer   \hv@@capPos=5
           \else
-            \ifx\hvSet at capPos\hv at Right   \hv@@capPos=6 % only for twocolumn mode
+            \ifx\hvSet at capPos\hv at Right   \hv@@capPos=6% only for twocolumn mode
             \else
-              \ifx\hvSet at capPos\hv at Left   \hv@@capPos=7 % only for twocolumn mode
+              \ifx\hvSet at capPos\hv at Left   \hv@@capPos=7% only for twocolumn mode
               \else
                 \hv@@capPos=0
               \fi
@@ -771,7 +840,7 @@
             \setPageObject\setBottomCaption
           \fi
         \fi
-      \else % onecolumn
+      \else% onecolumn
         \ifoddpage
           \setPageObject\setBottomCaption
         \else%  even page
@@ -778,13 +847,13 @@
           \afterpage{\setPageObject\setBottomCaption}%
         \fi
       \fi
-    \else % oneside
+    \else% oneside
       \if at twocolumn
         \ifoddpage
           \if at firstcolumn%  on right side
             \setBottomCaption\setPageObject
           \else
-          \setPageObject\setBottomCaption
+            \setPageObject\setBottomCaption
           \fi
         \else
           \if at firstcolumn%  on left side
@@ -817,7 +886,7 @@
           \setBottomCaption\setPageObject% start on same page/column 
         \fi
       \fi 
-    \else % onecolumn
+    \else% onecolumn
       \setBottomCaption\setPageObject
     \fi       
   \or%                caption on the outer column  5->outer
@@ -833,7 +902,7 @@
         \if at firstcolumn
           \setBottomCaption\setPageObject
         \else   
-          
+%%%               !!!!  to-do: !!!!          
         \fi
       \fi 
     \else% onecolumn
@@ -854,7 +923,7 @@
       \if at firstcolumn
         \setBottomCaption\setPageObject
       \else
-        \afterpage{\setBottomCaption\setPageObject}
+        \afterpage{\setBottomCaption\setPageObject}%
       \fi    
     \else%        onecolumn -> same as before
       \setBottomCaption\setPageObject
@@ -1053,7 +1122,7 @@
 }
 
 \def\setBottomCaption{%
-  \begin{\hv at floatType}[!b]
+  \begin{\hv at floatType}[!b]%
   \ifhv at separatorLine\drawSepLine\fi
   \par
   \usebox\hvCaptionBox



More information about the tex-live-commits mailing list.