summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-24 20:18:25 +0000
committerKarl Berry <karl@freefriends.org>2021-05-24 20:18:25 +0000
commit7053a6c036bf5929f8cf7bc5dd667a4041721917 (patch)
tree6c090189176a315c3c5cac30914440bf88d85da5
parentc5cbce16914d0f5880825e653a09e306fc2747f9 (diff)
pbalance (24may21)
git-svn-id: svn://tug.org/texlive/trunk@59331 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/pbalance/pbalance.pdfbin242707 -> 242951 bytes
-rw-r--r--Master/texmf-dist/source/latex/pbalance/pbalance.dtx10
-rw-r--r--Master/texmf-dist/tex/latex/pbalance/pbalance.sty7
3 files changed, 10 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/pbalance/pbalance.pdf b/Master/texmf-dist/doc/latex/pbalance/pbalance.pdf
index 7b8f149a1ab..43fc1c40f86 100644
--- a/Master/texmf-dist/doc/latex/pbalance/pbalance.pdf
+++ b/Master/texmf-dist/doc/latex/pbalance/pbalance.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/pbalance/pbalance.dtx b/Master/texmf-dist/source/latex/pbalance/pbalance.dtx
index ea005260859..9f984e0e114 100644
--- a/Master/texmf-dist/source/latex/pbalance/pbalance.dtx
+++ b/Master/texmf-dist/source/latex/pbalance/pbalance.dtx
@@ -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@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}}
{}
diff --git a/Master/texmf-dist/tex/latex/pbalance/pbalance.sty b/Master/texmf-dist/tex/latex/pbalance/pbalance.sty
index 43cdab7bfc7..1b54a4f76c6 100644
--- a/Master/texmf-dist/tex/latex/pbalance/pbalance.sty
+++ b/Master/texmf-dist/tex/latex/pbalance/pbalance.sty
@@ -18,7 +18,7 @@
%% The Current Maintainer of this work is Nelson Lago <lago@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@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}}
{}