fitbox (22feb19)

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

7 files changed, 88 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/latex/fitbox/README b/Master/texmf-dist/doc/latex/fitbox/README
index 688742d9deb..bdd64eb941a 100644
--- a/Master/texmf-dist/doc/latex/fitbox/README
+++ b/Master/texmf-dist/doc/latex/fitbox/README
@@ -6,7 +6,13 @@ 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.02 2019/02/20   Bug fixes
+	     		  New command \fitbox* for boxes inside floats
+			  New command \SetFitboxLayout for emulation of figsize
+			  package functionality
+
 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
+			  seem nonsensical (but warn the user)
diff --git a/Master/texmf-dist/doc/latex/fitbox/fitbox.bib b/Master/texmf-dist/doc/latex/fitbox/fitbox.bib
index 8e3f9e1727f..e7fbc0b6bbb 100644
--- a/Master/texmf-dist/doc/latex/fitbox/fitbox.bib
+++ b/Master/texmf-dist/doc/latex/fitbox/fitbox.bib
@@ -4,3 +4,11 @@
   title =         {{UK} List of {\TeX} Frequently Asked Questions},
   year =          {2015},
 }
+
+@Manual{FigSize,
+  title = 	 {The \textsl{FigSize} Package},
+  author = 	 {Anthony A. Tanbakuchi},
+  month = 	 {March},
+  year = 	 2002,
+  note = 	 {\url{https://ctan.org/pkg/figsize}}}
+
diff --git a/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf b/Master/texmf-dist/doc/latex/fitbox/fitbox.pdf
index da4caffbe07..3fc9228d468 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/napoleon.png b/Master/texmf-dist/doc/latex/fitbox/napoleon.png
new file mode 100644
index 00000000000..994fcd9cc69
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fitbox/napoleon.png
diff --git a/Master/texmf-dist/doc/latex/fitbox/sample-subfigure.pdf b/Master/texmf-dist/doc/latex/fitbox/sample-subfigure.pdf
new file mode 100644
index 00000000000..ba8f3147b70
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fitbox/sample-subfigure.pdf
diff --git a/Master/texmf-dist/doc/latex/fitbox/sample-subfigure.tex b/Master/texmf-dist/doc/latex/fitbox/sample-subfigure.tex
new file mode 100644
index 00000000000..cd8fd196b7e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fitbox/sample-subfigure.tex
@@ -0,0 +1,73 @@
+\documentclass{article}
+\usepackage{graphicx}
+\usepackage{fitbox}
+\usepackage{subfig}
+\begin{document}
+
+The use of fitbox with a subfigure.  Note that the optional argument
+for the command counts the lines for the subcaptions.  
+
+\SetFitboxLayout[subcaplines=1]{3}{2}
+
+
+
+
+\begin{figure}
+  \centering
+  \subfloat[First
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat[Second
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\\
+  \subfloat[Third
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat[Fourth
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\\
+  \subfloat[Fifth
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat[Sixth
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}
+  \caption{Six Napoleons, \texttt{\textbackslash SetFitboxLayout[subcaplines=1]\{3\}\{2\}}}
+  \label{fig:napoleons}
+\end{figure}
+
+\SetFitboxLayout{3}{2}
+
+\begin{figure}
+  \centering
+  \subfloat{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat{\fitbox*{\includegraphics{napoleon}}}\\
+  \subfloat{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat{\fitbox*{\includegraphics{napoleon}}}\\
+  \subfloat{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat{\fitbox*{\includegraphics{napoleon}}}
+  \caption{Six Napoleons, no subcaptions, \texttt{\textbackslash SetFitboxLayout\{3\}\{2\}}}
+  \label{fig:napoleons1}
+\end{figure}
+
+\SetFitboxLayout[subcaplines=1, maincaplines=2]{2}{3}
+
+
+
+
+\begin{figure}
+  \centering
+  \subfloat[First
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat[Second
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat[Third
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\\
+  \subfloat[Fourth
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat[Fifth
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}\quad
+  \subfloat[Sixth
+  Napoleon]{\fitbox*{\includegraphics{napoleon}}}
+  \caption{Six Napoleons, another arrangement\\
+    \texttt{\textbackslash SetFitboxLayout[subcaplines=1,
+      maincaplines=2]\{2\}\{3\}}} 
+  \label{fig:napoleons3}
+\end{figure}
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/fitbox/sample.pdf b/Master/texmf-dist/doc/latex/fitbox/sample.pdf
index 92a2a75c9be..f1e26175b5f 100644
--- a/Master/texmf-dist/doc/latex/fitbox/sample.pdf
+++ b/Master/texmf-dist/doc/latex/fitbox/sample.pdf