texlive[50005] Master/texmf-dist: fitbox (11feb19)
commits+karl at tug.org
commits+karl at tug.org
Mon Feb 11 23:05:43 CET 2019
Revision: 50005
http://tug.org/svn/texlive?view=revision&revision=50005
Author: karl
Date: 2019-02-11 23:05:43 +0100 (Mon, 11 Feb 2019)
Log Message:
-----------
fitbox (11feb19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fitbox/README
trunk/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf
trunk/Master/texmf-dist/doc/latex/fitbox/sample.pdf
trunk/Master/texmf-dist/source/latex/fitbox/fitbox.dtx
trunk/Master/texmf-dist/source/latex/fitbox/fitbox.ins
trunk/Master/texmf-dist/tex/latex/fitbox/fitbox.sty
Added Paths:
-----------
trunk/Master/texmf-dist/source/latex/fitbox/Makefile
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/fitbox/Makefile
Deleted: trunk/Master/texmf-dist/doc/latex/fitbox/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fitbox/Makefile 2019-02-11 22:05:25 UTC (rev 50004)
+++ trunk/Master/texmf-dist/doc/latex/fitbox/Makefile 2019-02-11 22:05:43 UTC (rev 50005)
@@ -1,61 +0,0 @@
-#
-#
-# This file is in public domain
-#
-# $Id: Makefile,v 1.2 2015-02-27 22:01:15 boris Exp $
-#
-
-PACKAGE=fitbox
-SAMPLES = sample.tex
-
-all: $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf}
-
-%.pdf: %.dtx $(PACKAGE).sty
- pdflatex $<
- - bibtex $*
- pdflatex $<
- - makeindex -s gind.ist -o $*.ind $*.idx
- - makeindex -s gglo.ist -o $*.gls $*.glo
- pdflatex $<
- while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
- do pdflatex $<; done
-
-
-
-
-%.sty: %.ins %.dtx
- pdflatex $<
-
-%.pdf: %.tex $(PACKAGE).sty
- pdflatex $*
- -bibtex $*
- pdflatex $*
- while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
- do pdflatex $*; done
-
-
-.PRECIOUS: $(PACKAGE).cfg $(PACKAGE).sty
-
-
-clean:
- $(RM) $(PACKAGE).sty *.log *.aux \
- *.cfg *.glo *.idx *.toc \
- *.ilg *.ind *.out *.lof \
- *.lot *.bbl *.blg *.gls *.hd \
- *.dvi *.ps *.tgz *.zip *.brf
-
-veryclean: clean
- $(RM) $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf}
-
-distclean: veryclean
-
-#
-# Archive for the distribution. Includes typeset documentation
-#
-archive: all clean
- tar -czvf $(PACKAGE).tgz -C .. --exclude '*~' --exclude '*.tgz' --exclude CVS $(PACKAGE)
-
-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
Modified: trunk/Master/texmf-dist/doc/latex/fitbox/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fitbox/README 2019-02-11 22:05:25 UTC (rev 50004)
+++ trunk/Master/texmf-dist/doc/latex/fitbox/README 2019-02-11 22:05:43 UTC (rev 50005)
@@ -5,3 +5,8 @@
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
Modified: trunk/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fitbox/sample.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/source/latex/fitbox/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/fitbox/Makefile (rev 0)
+++ trunk/Master/texmf-dist/source/latex/fitbox/Makefile 2019-02-11 22:05:43 UTC (rev 50005)
@@ -0,0 +1,61 @@
+#
+#
+# This file is in public domain
+#
+# $Id$
+#
+
+PACKAGE=fitbox
+SAMPLES = sample.tex
+
+all: $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf}
+
+%.pdf: %.dtx $(PACKAGE).sty
+ pdflatex $<
+ - bibtex $*
+ pdflatex $<
+ - makeindex -s gind.ist -o $*.ind $*.idx
+ - makeindex -s gglo.ist -o $*.gls $*.glo
+ pdflatex $<
+ while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
+ do pdflatex $<; done
+
+
+
+
+%.sty: %.ins %.dtx
+ pdflatex $<
+
+%.pdf: %.tex $(PACKAGE).sty
+ pdflatex $*
+ -bibtex $*
+ pdflatex $*
+ while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
+ do pdflatex $*; done
+
+
+.PRECIOUS: $(PACKAGE).cfg $(PACKAGE).sty
+
+
+clean:
+ $(RM) $(PACKAGE).sty *.log *.aux \
+ *.cfg *.glo *.idx *.toc \
+ *.ilg *.ind *.out *.lof \
+ *.lot *.bbl *.blg *.gls *.hd \
+ *.dvi *.ps *.tgz *.zip *.brf
+
+veryclean: clean
+ $(RM) $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf}
+
+distclean: veryclean
+
+#
+# Archive for the distribution. Includes typeset documentation
+#
+archive: all clean
+ 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/*'
Property changes on: trunk/Master/texmf-dist/source/latex/fitbox/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/fitbox/fitbox.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fitbox/fitbox.dtx 2019-02-11 22:05:25 UTC (rev 50004)
+++ trunk/Master/texmf-dist/source/latex/fitbox/fitbox.dtx 2019-02-11 22:05:43 UTC (rev 50005)
@@ -1,7 +1,6 @@
% \iffalse
-% $Id: fitbox.dtx,v 1.6 2015/08/16 18:11:50 boris Exp $
%
-%% Copyright 2015, Boris Veytsman <borisv at lk.net
+%% Copyright 2015-2019, Boris Veytsman <borisv at 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 at box\relax
% Checking the sizes
\expandafter\ifdim\cmdKV at FTBX@minwidth>\columnwidth\relax
- \PackageWarning{fitbox}{Minimal width is larger than page
- width. Adjusting...}%
- \def\cmd at KV@FTBX at minwidth{\columnwidth}%
+ \PackageWarning{fitbox}{Minimal width is too large. Consider
+ changing it to \the\hsize}%
\fi
- \expandafter\ifdim\cmdKV at FTBX@maxwidth>\columnwidth\relax
- \PackageWarning{fitbox}{Desired width is larger than page
- width. Adjusting...}%
- \def\cmd at KV@FTBX at maxwidth{\columnwidth}%
+ \expandafter\ifdim\cmdKV at FTBX@maxwidth>\hsize\relax
+ \PackageWarning{fitbox}{Desired width is too large. Consider
+ changing it to \the\hsize}%
\fi
\expandafter\ifdim\cmdKV at FTBX@minheight>\textheight\relax
- \PackageWarning{fitbox}{Minimal height is larger than page
- height. Adjusting...}%
- \def\cmd at KV@FTBX at minheight{\textheight}%
+ \PackageWarning{fitbox}{Minimal height is too large.
+ Consider changing it to \the\textheight}%
\fi
\expandafter\ifdim\cmdKV at FTBX@maxheight>\textheight\relax
- \PackageWarning{fitbox}{Desired height is larger than page
- height. Adjusting...}%
- \def\cmd at KV@FTBX at maxheight{\textheight}%
+ \PackageWarning{fitbox}{Desired height is too laege.
+ Consider changing it to \the\textheight}%
\fi
% Calculating the minimal and maximal height
\Gscale at div{\@tempa}{\cmdKV at FTBX@maxwidth}{\fitboxnatwidth}%
@@ -319,9 +315,8 @@
\expandafter\FTBX at desired@minheight=\cmdKV at FTBX@minheight\relax
\fi
\ifdim\FTBX at desired@minheight>\FTBX at desired@maxheight\relax
- \PackageWarning{fitbox}{Desired min scale exceeds desired min
- scale. Adjusting...}%
- \FTBX at desired@minheight=\FTBX at desired@maxheight\relax
+ \PackageWarning{fitbox}{Desired min scale exceeds desired max
+ scale.}%
\fi
\FTBX at available@height=\pagegoal\relax
\ifdim\FTBX at available@height>\vsize\relax
Modified: trunk/Master/texmf-dist/source/latex/fitbox/fitbox.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/fitbox/fitbox.ins 2019-02-11 22:05:25 UTC (rev 50004)
+++ trunk/Master/texmf-dist/source/latex/fitbox/fitbox.ins 2019-02-11 22:05:43 UTC (rev 50005)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/fitbox/fitbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fitbox/fitbox.sty 2019-02-11 22:05:25 UTC (rev 50004)
+++ trunk/Master/texmf-dist/tex/latex/fitbox/fitbox.sty 2019-02-11 22:05:43 UTC (rev 50005)
@@ -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 at lk.net
+%% Copyright 2015-2019, Boris Veytsman <borisv at 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 at box
\newdimen\FTBX at desired@maxheight
@@ -58,24 +58,20 @@
\advance\fitboxnatheight by \dp\FTBX at box\relax
% Checking the sizes
\expandafter\ifdim\cmdKV at FTBX@minwidth>\columnwidth\relax
- \PackageWarning{fitbox}{Minimal width is larger than page
- width. Adjusting...}%
- \def\cmd at KV@FTBX at minwidth{\columnwidth}%
+ \PackageWarning{fitbox}{Minimal width is too large. Consider
+ changing it to \the\hsize}%
\fi
- \expandafter\ifdim\cmdKV at FTBX@maxwidth>\columnwidth\relax
- \PackageWarning{fitbox}{Desired width is larger than page
- width. Adjusting...}%
- \def\cmd at KV@FTBX at maxwidth{\columnwidth}%
+ \expandafter\ifdim\cmdKV at FTBX@maxwidth>\hsize\relax
+ \PackageWarning{fitbox}{Desired width is too large. Consider
+ changing it to \the\hsize}%
\fi
\expandafter\ifdim\cmdKV at FTBX@minheight>\textheight\relax
- \PackageWarning{fitbox}{Minimal height is larger than page
- height. Adjusting...}%
- \def\cmd at KV@FTBX at minheight{\textheight}%
+ \PackageWarning{fitbox}{Minimal height is too large.
+ Consider changing it to \the\textheight}%
\fi
\expandafter\ifdim\cmdKV at FTBX@maxheight>\textheight\relax
- \PackageWarning{fitbox}{Desired height is larger than page
- height. Adjusting...}%
- \def\cmd at KV@FTBX at maxheight{\textheight}%
+ \PackageWarning{fitbox}{Desired height is too laege.
+ Consider changing it to \the\textheight}%
\fi
% Calculating the minimal and maximal height
\Gscale at div{\@tempa}{\cmdKV at FTBX@maxwidth}{\fitboxnatwidth}%
@@ -89,9 +85,8 @@
\expandafter\FTBX at desired@minheight=\cmdKV at FTBX@minheight\relax
\fi
\ifdim\FTBX at desired@minheight>\FTBX at desired@maxheight\relax
- \PackageWarning{fitbox}{Desired min scale exceeds desired min
- scale. Adjusting...}%
- \FTBX at desired@minheight=\FTBX at desired@maxheight\relax
+ \PackageWarning{fitbox}{Desired min scale exceeds desired max
+ scale.}%
\fi
\FTBX at available@height=\pagegoal\relax
\ifdim\FTBX at available@height>\vsize\relax
More information about the tex-live-commits
mailing list