fitbox (11feb19)

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

7 files changed, 39 insertions, 45 deletions

diff --git a/Master/texmf-dist/doc/latex/fitbox/README b/Master/texmf-dist/doc/latex/fitbox/README
index 48232ed90eb..688742d9deb 100644
--- a/Master/texmf-dist/doc/latex/fitbox/README
+++ b/Master/texmf-dist/doc/latex/fitbox/README
@@ -5,3 +5,8 @@ The fitbox package allows a box (usually an \includegraphics box) to
 fit on the page.  It scales the box to the maximal allowed size within
 the user-set limits. If there there is not enough space on the page,
 the box is moved to the next one.
+
+version 1.01 2019/02/10   Use the width of the box around the graphics for
+                          default max width.
+			  Do not adjust user provided values even if they
+			  seem nonsensical (but warn the user)
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf b/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf
index 995ff4f73e1..da4caffbe07 100644
--- a/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf
+++ b/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf
diff --git a/Master/texmf-dist/doc/latex/fitbox/sample.pdf b/Master/texmf-dist/doc/latex/fitbox/sample.pdf
index 8a3f6e5ab42..92a2a75c9be 100644
--- a/Master/texmf-dist/doc/latex/fitbox/sample.pdf
+++ b/Master/texmf-dist/doc/latex/fitbox/sample.pdf
diff --git a/Master/texmf-dist/doc/latex/fitbox/Makefile b/Master/texmf-dist/source/latex/fitbox/Makefile
index d5bc79b993f..980068232b3 100644
--- a/Master/texmf-dist/doc/latex/fitbox/Makefile
+++ b/Master/texmf-dist/source/latex/fitbox/Makefile
@@ -2,7 +2,7 @@
 #
 # This file is in public domain
 #
-# $Id: Makefile,v 1.2 2015-02-27 22:01:15 boris Exp $
+# $Id$
 #
 
 PACKAGE=fitbox
@@ -53,9 +53,9 @@ distclean: veryclean
 # Archive for the distribution. Includes typeset documentation
 #
 archive:  all clean
-	tar -czvf $(PACKAGE).tgz -C .. --exclude '*~' --exclude '*.tgz' --exclude CVS $(PACKAGE)
+	COPYFILE_DISABLE=1 tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip'  --exclude CVS --exclude '.git*' $(PACKAGE); mv ../$(PACKAGE).tgz .
 
 zip:  all clean
 	${MAKE} $(PACKAGE).sty
 	$(RM) *.log
-	zip -r  $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*'
\ No newline at end of file
+	zip -r  $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*'
diff --git a/Master/texmf-dist/source/latex/fitbox/fitbox.dtx b/Master/texmf-dist/source/latex/fitbox/fitbox.dtx
index 2603e758efb..48cff414b24 100644
--- a/Master/texmf-dist/source/latex/fitbox/fitbox.dtx
+++ b/Master/texmf-dist/source/latex/fitbox/fitbox.dtx
@@ -1,7 +1,6 @@
 % \iffalse
-% $Id: fitbox.dtx,v 1.6 2015/08/16 18:11:50 boris Exp $
 %
-%% 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 
@@ -22,12 +21,11 @@
 %</gobble>
 %<style>\ProvidesPackage{fitbox}
 %<*style>
-[2015/02/02 v1.00 Fitting boxes on a page]
+[2019/02/10 v1.01 Fitting boxes on a page]
 %    \end{macrocode}
 %</style>
 %<*gobble>
 % \fi
-% \CheckSum{188}
 %
 %
 %% \CharacterTable
@@ -177,7 +175,7 @@
 % \item[maxheight:] The maximal total height of the box.  By default
 % \cs{textheight}. 
 % \item[maxwidth:] The maximal width of the box.  By default
-% \cs{textwidth}. 
+% the size of the current box to be constructed. 
 % \item[minheight:] The minimal height of the box.  By default
 % \cs{fitboxnatheight}. 
 % \item[minwidth:] The minimal width of the box.  By default
@@ -242,10 +240,11 @@
 %   
 % \end{macro}
 %
+%\changes{v1.01}{2019/02/10}{Changed maximal width}
 % The defaults
 %    \begin{macrocode}
 \fitboxset{maxheight=\textheight, minheight=\fitboxnatheight,
-  maxwidth=\textwidth, minwidth=\fitboxnatwidth,
+  maxwidth=\hsize, minwidth=\fitboxnatwidth,
   belowboxspace=0pt, maxenlargepage=0pt}
 %    \end{macrocode}
 % 
@@ -278,6 +277,7 @@
 % \end{macro}
 %
 % \begin{macro}{\fitbox}
+%\changes{v1.01}{2019/02/10}{Do not force adjusting the width}
 %   The main command
 %    \begin{macrocode}
 \newcommand\fitbox[2][]{\leavevmode
@@ -288,24 +288,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}%
@@ -319,9 +315,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
diff --git a/Master/texmf-dist/source/latex/fitbox/fitbox.ins b/Master/texmf-dist/source/latex/fitbox/fitbox.ins
index 6d4e2cf3f0d..68df1a0901a 100644
--- a/Master/texmf-dist/source/latex/fitbox/fitbox.ins
+++ b/Master/texmf-dist/source/latex/fitbox/fitbox.ins
@@ -1,7 +1,6 @@
 %
 % Doctrip file for fitbox
 % This file is in public domain
-% $Id: fitbox.ins,v 1.1 2015-02-02 19:59:36 boris Exp $
 %
 \def\batchfile{fitbox.ins}
 \input docstrip
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