texlive[59331] Master/texmf-dist: pbalance (24may21)

[commits+karl at tug.org]

Revision: 59331
          http://tug.org/svn/texlive?view=revision&revision=59331
Author:   karl
Date:     2021-05-24 22:18:25 +0200 (Mon, 24 May 2021)
Log Message:
-----------
pbalance (24may21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/pbalance/pbalance.pdf
    trunk/Master/texmf-dist/source/latex/pbalance/pbalance.dtx
    trunk/Master/texmf-dist/tex/latex/pbalance/pbalance.sty

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

Modified: trunk/Master/texmf-dist/source/latex/pbalance/pbalance.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/pbalance/pbalance.dtx	2021-05-24 20:17:55 UTC (rev 59330)
+++ trunk/Master/texmf-dist/source/latex/pbalance/pbalance.dtx	2021-05-24 20:18:25 UTC (rev 59331)
@@ -15,7 +15,7 @@
 % \iffalse
 %
 %<package>\NeedsTeXFormat{LaTeX2e}[2015/01/01]
-%<package>\ProvidesPackage{pbalance}[2021/04/26 v1.1.0 Poor man's balance]
+%<package>\ProvidesPackage{pbalance}[2021/05/24 v1.1.1 Poor man's balance]
 %
 %<*driver>
 
@@ -58,6 +58,8 @@
 % \changes{v1.0}{2020/09/14}{Initial version}
 % \changes{v1.0.1}{2020/12/16}{Improvements to documentation}
 % \changes{v1.1.0}{2021/04/26}{Do not crash in one-column mode}
+% \changes{v1.1.1}{2021/05/24}{Do not use balance package if
+%                              there are dbltop floats}
 %
 % \GetFileInfo{pbalance.sty}
 %
@@ -449,8 +451,7 @@
 \newcommand\@PBifbotfloat[2]{\ifx\@botlist\empty #2\else #1\fi}
 \newcommand\@PBiffootnote[2]{\ifvoid\footins #2\else #1\fi}
 \newcommand\@PBiffloatcol[2]{\if at fcolmade #1\else #2\fi}
-% dbltop floats are apparently ok with the balance package
-%%%\newcommand\@PBifdbltopfloat[2]{\ifx\@dbltoplist\empty #2\else #1\fi}
+\newcommand\@PBifdbltopfloat[2]{\ifx\@dbltoplist\empty #2\else #1\fi}
 % dblbotlist only exists with package stfloats
 \newcommand\@PBifdblbotfloat[2]{%
   \ifdefvoid{\@dblbotlist}
@@ -469,7 +470,8 @@
   \ifboolexpr
     {
       test {\@PBifmidfloat} or test {\@PBiftopfloat} or
-      test {\@PBifbotfloat} or test {\@PBifdblbotfloat}
+      test {\@PBifbotfloat} or test {\@PBifdblbotfloat} or
+      test {\@PBifdbltopfloat}
     }
     {\global\toggletrue{@PBtmpHasFloats}}
     {}

Modified: trunk/Master/texmf-dist/tex/latex/pbalance/pbalance.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pbalance/pbalance.sty	2021-05-24 20:17:55 UTC (rev 59330)
+++ trunk/Master/texmf-dist/tex/latex/pbalance/pbalance.sty	2021-05-24 20:18:25 UTC (rev 59331)
@@ -18,7 +18,7 @@
 %% The Current Maintainer of this work is Nelson Lago <lago at ime.usp.br>.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2015/01/01]
-\ProvidesPackage{pbalance}[2021/04/26 v1.1.0 Poor man's balance]
+\ProvidesPackage{pbalance}[2021/05/24 v1.1.1 Poor man's balance]
 
 \RequirePackage{etoolbox}
 \RequirePackage{expl3}
@@ -168,7 +168,7 @@
 \newcommand\@PBifbotfloat[2]{\ifx\@botlist\empty #2\else #1\fi}
 \newcommand\@PBiffootnote[2]{\ifvoid\footins #2\else #1\fi}
 \newcommand\@PBiffloatcol[2]{\if at fcolmade #1\else #2\fi}
-%%%\newcommand\@PBifdbltopfloat[2]{\ifx\@dbltoplist\empty #2\else #1\fi}
+\newcommand\@PBifdbltopfloat[2]{\ifx\@dbltoplist\empty #2\else #1\fi}
 \newcommand\@PBifdblbotfloat[2]{%
   \ifdefvoid{\@dblbotlist}
     {#2}
@@ -184,7 +184,8 @@
   \ifboolexpr
     {
       test {\@PBifmidfloat} or test {\@PBiftopfloat} or
-      test {\@PBifbotfloat} or test {\@PBifdblbotfloat}
+      test {\@PBifbotfloat} or test {\@PBifdblbotfloat} or
+      test {\@PBifdbltopfloat}
     }
     {\global\toggletrue{@PBtmpHasFloats}}
     {}