fitbox (11feb19)

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

1 files changed, 14 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/fitbox/fitbox.sty b/Master/texmf-dist/tex/latex/fitbox/fitbox.sty
index 4e0d63b964d..2dbc31bd33a 100644
--- a/Master/texmf-dist/tex/latex/fitbox/fitbox.sty
+++ b/Master/texmf-dist/tex/latex/fitbox/fitbox.sty
@@ -20,7 +20,7 @@
 %% original source files, as listed above, are part of the
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
-%% Copyright 2015, Boris Veytsman <borisv@lk.net
+%% Copyright 2015-2019, Boris Veytsman <borisv@lk.net
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
 %% version 1.3 of this license or (at your option) any
@@ -36,7 +36,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fitbox}
-[2015/02/02 v1.00 Fitting boxes on a page]
+[2019/02/10 v1.01 Fitting boxes on a page]
 \newdimen\fitboxnatheight
 \newdimen\fitboxnatwidth
 \RequirePackage{xkeyval}
@@ -44,7 +44,7 @@
   belowboxspace, maxenlargepage}
 \def\fitboxset#1{\setkeys{FTBX}{#1}}
 \fitboxset{maxheight=\textheight, minheight=\fitboxnatheight,
-  maxwidth=\textwidth, minwidth=\fitboxnatwidth,
+  maxwidth=\hsize, minwidth=\fitboxnatwidth,
   belowboxspace=0pt, maxenlargepage=0pt}
 \newbox\FTBX@box
 \newdimen\FTBX@desired@maxheight
@@ -58,24 +58,20 @@
   \advance\fitboxnatheight by \dp\FTBX@box\relax
   % Checking the sizes
   \expandafter\ifdim\cmdKV@FTBX@minwidth>\columnwidth\relax
-      \PackageWarning{fitbox}{Minimal width is larger than page
-        width.  Adjusting...}%
-      \def\cmd@KV@FTBX@minwidth{\columnwidth}%
+      \PackageWarning{fitbox}{Minimal width is too large.  Consider
+        changing it to \the\hsize}%
   \fi
-  \expandafter\ifdim\cmdKV@FTBX@maxwidth>\columnwidth\relax
-      \PackageWarning{fitbox}{Desired width is larger than page
-        width.  Adjusting...}%
-      \def\cmd@KV@FTBX@maxwidth{\columnwidth}%
+  \expandafter\ifdim\cmdKV@FTBX@maxwidth>\hsize\relax
+      \PackageWarning{fitbox}{Desired width is too large.  Consider
+        changing it to \the\hsize}%
   \fi
   \expandafter\ifdim\cmdKV@FTBX@minheight>\textheight\relax
-      \PackageWarning{fitbox}{Minimal height is larger than page
-        height.  Adjusting...}%
-      \def\cmd@KV@FTBX@minheight{\textheight}%
+      \PackageWarning{fitbox}{Minimal height is too large.
+        Consider changing it to \the\textheight}%
   \fi
   \expandafter\ifdim\cmdKV@FTBX@maxheight>\textheight\relax
-      \PackageWarning{fitbox}{Desired height is larger than page
-        height.  Adjusting...}%
-      \def\cmd@KV@FTBX@maxheight{\textheight}%
+      \PackageWarning{fitbox}{Desired height is too laege.
+        Consider changing it to \the\textheight}%
   \fi
   % Calculating the minimal and maximal height
   \Gscale@div{\@tempa}{\cmdKV@FTBX@maxwidth}{\fitboxnatwidth}%
@@ -89,9 +85,8 @@
      \expandafter\FTBX@desired@minheight=\cmdKV@FTBX@minheight\relax
   \fi
   \ifdim\FTBX@desired@minheight>\FTBX@desired@maxheight\relax
-      \PackageWarning{fitbox}{Desired min scale exceeds desired min
-        scale.  Adjusting...}%
-      \FTBX@desired@minheight=\FTBX@desired@maxheight\relax
+      \PackageWarning{fitbox}{Desired min scale exceeds desired max
+        scale.}%
   \fi
   \FTBX@available@height=\pagegoal\relax
   \ifdim\FTBX@available@height>\vsize\relax