texlive[73130] Master/texmf-dist: hvfloat (15dec24)

[commits+karl at tug.org]

Revision: 73130
          https://tug.org/svn/texlive?view=revision&revision=73130
Author:   karl
Date:     2024-12-15 22:12:54 +0100 (Sun, 15 Dec 2024)
Log Message:
-----------
hvfloat (15dec24)

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

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2024-12-15 21:12:38 UTC (rev 73129)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2024-12-15 21:12:54 UTC (rev 73130)
@@ -1,4 +1,5 @@
 hvfloat.sty:    
+2.52  2024-12-15  - revert changes for the test of on top left of page
 2.51  2024-10-02  - added option nonFloatTopSkip, preset to 2pt like \interlineskip
                     only valid for nonFloats and caption not on top
 2.50  2024-04-06  - first try for a check on page beginning

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

Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc	2024-12-15 21:12:38 UTC (rev 73129)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc	2024-12-15 21:12:54 UTC (rev 73130)
@@ -48,11 +48,11 @@
     \do at hvFloat@doublePAGECaptionRight{#1}%   no cheque
   \else
   \checkoddpage
-  \ifoddpage
+  \ifoddpage %  we are on the right page 
     \hvfloat at typeout{do at hvFloat@doublePage:oddpage}%
     \if at twocolumn
       \hvfloat at typeout{do at hvFloat@doublePage: oddpage/twocolumn}%
-      \if at firstcolumn
+      \if at firstcolumn % we are in the left column of the right page
         \hvfloat at typeout{do at hvFloat@doublePage:oddpage->twocolumn->firstcolumn}%
         \ifhv at switchType
           \hvfloat at typeout{hvfloat: switched to floattype p}%
@@ -61,12 +61,12 @@
             \do at hvFloat@doublePAGECaptionRight{#1}}%
         \else
           \hvfloat at typeout{calling do at hvFloat@doublePageCaptionRight}%
-          %\afterpage{%
           \afterpage{%
+            \afterpage{%
             \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
-            \do at hvFloat@doublePageCaptionRight{#1}}%}%
+            \do at hvFloat@doublePageCaptionRight{#1}}}%
         \fi
-      \else
+      \else % we are in the right column of the right page
 %        \hvfloat at typeout{do at hvFloat@doublePage:oddpage->twocolumn->secondcolumn}%
         \ifhv at tugboat
           \do at hvFloat@doublePageCaptionRight{#1}%
@@ -98,8 +98,9 @@
     \fi  
   \else% we have an even page
     \hvfloat at typeout{do at hvFloat@doublePage:evenpage -> (\thepage)}%
+    \global\hv at atPageBeginfalse
+\iffalse
     \test at typeout{>>>>Setze hv at atPageBeginfalse}%
-    \global\hv at atPageBeginfalse
 %    \stepcounter{hvfloat at ref}%
     \zsavepos{\thehvfloat at ref}%
     \@tempy=\dimexpr-\zposy{\thehvfloat at ref} sp+\paperheight-1in-\topmargin-\headheight-\headsep\relax
@@ -118,30 +119,30 @@
       \fi
     \fi
   %---------
+\fi
     \ifhv at atPageBegin% At the top left of the even page -> output image
        \do at hvFloat@doublePageCaptionRight{#1}
     \else
       \if at twocolumn
-        \if at firstcolumn
+        \if at firstcolumn % We are in the left column of the left page
           \ifhv at switchType
             \afterpage{\afterpage{%
             \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
               \do at hvFloat@doublePAGECaptionRight{#1}}}%
-          \else
+          \else % 
             \afterpage{\afterpage{\afterpage{%
-            \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
-            \do at hvFloat@doublePageCaptionRight{#1}}}}%
+              \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+              \do at hvFloat@doublePageCaptionRight{#1}}}}%
           \fi
-        \else% second column
+        \else% second column(right column on left page) 
           \ifhv at switchType
             \afterpage{%
             \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
             \do at hvFloat@doublePAGECaptionRight{#1}}%
           \else
-            %\afterpage{
-            \afterpage{%
+            \afterpage{\afterpage{%
               \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
-              \do at hvFloat@doublePageCaptionRight{#1}}%}%
+              \do at hvFloat@doublePageCaptionRight{#1}}}%
           \fi
         \fi
       \else% onecolumn

Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2024-12-15 21:12:38 UTC (rev 73129)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2024-12-15 21:12:54 UTC (rev 73130)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 1014 2024-10-03 08:22:14Z herbert $
+%% $Id: hvfloat.sty 1046 2024-12-15 09:30:17Z herbert $
 %%
 %%
 %% IMPORTANT NOTICE:
@@ -16,8 +16,8 @@
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.51}
-\def\filedate{2024/10/02}
+\def\fileversion{2.52}
+\def\filedate{2024/12/15}
 \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
 \let\hvFloatFileVersion\fileversion
 %