From d99fe4006ba9110ddc1f87e8e9b10c085ac51da6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Feb 2019 22:05:43 +0000 Subject: fitbox (11feb19) git-svn-id: svn://tug.org/texlive/trunk@50005 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fitbox/Makefile | 61 ----------------------- Master/texmf-dist/doc/latex/fitbox/README | 5 ++ Master/texmf-dist/doc/latex/fitbox/fitbox.pdf | Bin 256045 -> 257736 bytes Master/texmf-dist/doc/latex/fitbox/sample.pdf | Bin 83215 -> 83215 bytes Master/texmf-dist/source/latex/fitbox/Makefile | 61 +++++++++++++++++++++++ Master/texmf-dist/source/latex/fitbox/fitbox.dtx | 39 +++++++-------- Master/texmf-dist/source/latex/fitbox/fitbox.ins | 1 - Master/texmf-dist/tex/latex/fitbox/fitbox.sty | 33 ++++++------ 8 files changed, 97 insertions(+), 103 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/fitbox/Makefile create mode 100644 Master/texmf-dist/source/latex/fitbox/Makefile (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/fitbox/Makefile b/Master/texmf-dist/doc/latex/fitbox/Makefile deleted file mode 100644 index d5bc79b993f..00000000000 --- a/Master/texmf-dist/doc/latex/fitbox/Makefile +++ /dev/null @@ -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 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 Binary files a/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf and b/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/fitbox/sample.pdf b/Master/texmf-dist/doc/latex/fitbox/sample.pdf index 8a3f6e5ab42..92a2a75c9be 100644 Binary files a/Master/texmf-dist/doc/latex/fitbox/sample.pdf and b/Master/texmf-dist/doc/latex/fitbox/sample.pdf differ diff --git a/Master/texmf-dist/source/latex/fitbox/Makefile b/Master/texmf-dist/source/latex/fitbox/Makefile new file mode 100644 index 00000000000..980068232b3 --- /dev/null +++ b/Master/texmf-dist/source/latex/fitbox/Makefile @@ -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/*' 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 % %<*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 \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 -- cgit v1.2.3