summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-10 21:28:10 +0000
committerKarl Berry <karl@freefriends.org>2022-01-10 21:28:10 +0000
commit3c62f06e388783aac7edc1711b73670d47ef9ec7 (patch)
treeaf31b3d966ccae03bf5ca069f6dde0821611fcef
parentd11db15f4ca13efd03358b7f8212591346432d15 (diff)
keyfloat (10jan22)
git-svn-id: svn://tug.org/texlive/trunk@61561 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/keyfloat/README.txt4
-rw-r--r--Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdfbin1025675 -> 1038224 bytes
-rw-r--r--Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx294
-rw-r--r--Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty21
4 files changed, 267 insertions, 52 deletions
diff --git a/Master/texmf-dist/doc/latex/keyfloat/README.txt b/Master/texmf-dist/doc/latex/keyfloat/README.txt
index f9586fd2ba4..dbb9df58a66 100644
--- a/Master/texmf-dist/doc/latex/keyfloat/README.txt
+++ b/Master/texmf-dist/doc/latex/keyfloat/README.txt
@@ -1,8 +1,8 @@
The LaTeX keyfloat package
Provides a key/value interface for generating floats.
-v2.06
-Copyright 2016-2021 Brian Dunn — www.BDTechConcepts.com
+v2.07
+Copyright 2016-2022 Brian Dunn — www.BDTechConcepts.com
LaTeX Project Public License, version 1.3
diff --git a/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf b/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf
index 6493f59785d..648038fb1a3 100644
--- a/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf
+++ b/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx b/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx
index a729c86a4b5..edd35cb03b0 100644
--- a/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx
+++ b/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx
@@ -1,7 +1,7 @@
%
% \iffalse meta-comment
%
-% Copyright 2016--2021 Brian Dunn
+% Copyright 2016--2022 Brian Dunn
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{keyfloat}
-%<package> [2021/06/29 v2.06 Key/value interface for floats and subfloats.]
+%<package> [2022/01/10 v2.07 Key/value interface for floats and subfloats.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -71,26 +71,15 @@
\newunicodechar{‡}{\ddag}
\newunicodechar{⚠}{\textwarning}
+\usepackage{etoolbox}
+\usepackage{xparse}
-\usepackage{metalogo}
-\makeatletter
-\@ifpackageloaded{erewhon}{
-\setlogokern{Te}{-.08em}
-\setlogokern{eX}{-0.04em}
-\setlogokern{La}{-.25em}
-\setlogokern{aT}{-.08em}
-\setlogokern{Xe}{-.04em}
-\setlogokern{eL}{-.06em}
-\setlogodrop{0.27ex}
-}{}
-\makeatother
+\usepackage{metalogox}
\usepackage{microtype}
-\usepackage{etoolbox}
-\usepackage[log-declarations=false]{xparse}
@@ -235,7 +224,8 @@ frametitlerulewidth=1pt,frametitleaboveskip=5pt,%
\pagestyle{pageheadfoot}
-\usepackage{dtxdescribe}[2019/01/11]
+% Indexing, logos, \Describexxxx, etc:
+\usepackage{dtxdescribe}[2021/09/02]
@@ -349,7 +339,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%<*package>
% \fi
%
-% \CheckSum{1392}
+% \CheckSum{1400}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -390,6 +380,8 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \changes{v2.04}{2021/06/08}{2021/06/08}
% \changes{v2.05}{2021/06/11}{2021/06/11}
% \changes{v2.06}{2021/06/29}{2021/06/29}
+% \changes{v2.07}{2021/08/30}{Docs: Show macro and environment nesting.}
+% \changes{v2.07}{2022/01/10}{2022/01/10}
@@ -413,7 +405,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%
% \bigskip
%
-% {\small\textcopyright{} 2016--2021} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}
+% {\small\textcopyright{} 2016--2022} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}
%
% \vspace{.5in}
%
@@ -1675,19 +1667,15 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% lw=1,c={Keywrap with \cs{keyfig}},l=fig:keywrapfig%
% }{image}}
% Second item.
-% Several lines of text text text text text
-% text text text text text text text text text
-% text text text text text text text.
%
% These paragraphs are inside the \texttt{keywrap}.
% A vertical gap appears below if the text is not enough to
% fill the space next to the \cs{keyfig}.
% \end{keywrap}
-% Outside the \env{wrapfig},\margintag{notes}\
+% Now outside the \env{keywrap},\margintag{notes}\
% but still in the second item.
% There is no elegant way to place only part of a paragraph
-% inside a \env{keywrap}, and attempting to do so requires
-% manually removing the vertical paragraph skip.
+% inside a \env{keywrap}.
% \item Third item.
% \end{itemize}
% \end{dtxexample}
@@ -1725,7 +1713,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \setlength{\KFLTtightframewidth}{1pt}
%
% \renewcommand{\KFLTlooseframe}[1]{%
-% \begin{mdlooseframe}[leftmargin=1.5in,rightmargin=1.5in]%
+% \begin{mdlooseframe}[leftmargin=.5in,rightmargin=.5in]%
% #1
% \end{mdlooseframe}%
% }
@@ -1733,7 +1721,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%
% \keyfig{ft,c=Custom-framed image,l=fig:customframe,r=90}{image}
% \keyfigbox{f,c=Custom loosely-framed box,
-% l=fig:customlooseframe}{A loosely-framed box.}
+% l=fig:customlooseframe}{A loosely-framed box.}
% \end{dtxexample}
%
% \gindex{frame>mdframed}
@@ -2080,6 +2068,9 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \section{Code}
% ^^A *source
%
+%
+%
+%
% \subsection{Older packages}
%
% Ensure that \pkg{tocdata}, if loaded, is new enough:
@@ -2218,6 +2209,10 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% These macros are commonly used by others.
% \begin{environment}{tablehere} Place a table exactly [H].
+%
+% \shownesting{\env{tablehere}}
+% {\shownesting{\env{minipage}}{Contents}}
+%
% \changes{v2.01}{2019/09/11}{Fix: Font and color.}
% \changes{v2.01}{2019/09/14}{Improved vertical space.}
% \begin{macrocode}
@@ -2233,6 +2228,10 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{environment}
% \begin{environment}{figurehere} Place a figure exactly [H].
+%
+% \shownesting{\env{figurehere}}
+% {\shownesting{\env{minipage}}{Contents}}
+%
% \changes{v2.01}{2019/09/11}{Fix: Font and color.}
% \changes{v2.01}{2019/09/14}{Improved vertical space.}
% \begin{macrocode}
@@ -3074,6 +3073,9 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \item [\cs{KFLTtightframe}:] Redefine to a macro which frames its contents.
% \item [\cs{KFLTtightframewidth}:] Redefine to the total width of the new.
% frame and its separation.
+% \item[\cs{KFLTlooseframe}:] Redefine to a macro which frames its contents.
+% \item[\cs{KFLTlooseframewidth}:] Redefine to the total width of the new
+% frame and its separation.
% \end{description}
%
% \begin{macro}{\KFLTtightframe} \marg{contents}
@@ -3099,12 +3101,6 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%
% A user-redefinable macro and length to loosely frame the contents.
%
-% \begin{description}
-% \item[\cs{KFLTlooseframe}:] Redefine to a macro which frames its contents.
-% \item[\cs{KFLTlooseframewidth}:] Redefine to the total width of the new
-% frame and its separation.
-% \end{description}
-%
% \begin{macrocode}
\newcommand{\KFLTlooseframe}[1]{%
\setlength{\fboxsep}{3pt}%
@@ -3125,14 +3121,25 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \begin{macro}{\KFLT@frame} \marg{contents}
%
% Frames the contents according to the |f| key. To be nested for further processing.
+% \changes{v2.07}{2022/01/08}{Reduced hbox warnings.}
% \begin{macrocode}
\newcommand{\KFLT@frame}[1]
{%
\ifbool{KFLT@ft}%
- {\KFLTtightframe{#1}}%
+ {%
+ {%
+ \hfuzz=\linewidth%
+ \KFLTtightframe{#1}%
+ }%
+ }%
{% not tightframe
\ifbool{KFLT@f}%
- {\KFLTlooseframe{#1}}%
+ {%
+ {%
+ \hfuzz=\linewidth%
+ \KFLTlooseframe{#1}%
+ }%
+ }%
{#1}% no frame
}% not looseframe
}
@@ -3214,6 +3221,15 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%
% Create an image with size, frame, and turn.
%
+% \shownesting{\cs{KFLT@onefigureimage}}
+% {
+% \shownesting{\env{turn}}
+% {
+% \shownesting{\cs{KFLT@frame} $\to$ \cs{fbox}}
+% {\cs{KFLT@includegraphics}}
+% }
+% }
+%
% \changes{v2.00}{2019/03/12}{Filename in arg instead of \cs{KFLT@i}.}
% \changes{v2.06}{2021/06/25}{Added \optn{kar}.}
% \begin{macrocode}
@@ -3871,9 +3887,22 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{macrocode}
+% \newcommand*{\showKFLTboxinner}[1]{%
+% \shownesting{\env{KFLT@boxinner}}{
+% \shownesting{\cs{KFLT@frame} $\to$ \cs{fbox}}
+% {
+% \shownesting{\env{turn}}
+% {\shownesting{\env{minipage}}{#1}}
+% }
+% }
+% }
+%
% \begin{environment}{KFLT@boxinner}
%
% Typeset the contents in a width which depends on the keys.
+%
+% \showKFLTboxinner{Contents}
+%
% \begin{macrocode}
\newsavebox{\KFLT@envbox}
@@ -3940,8 +3969,11 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
\KFLT@defaults%
% \end{macrocode}
% Remember the float type:
+% \changes{v2.07}{2022/01/06}{Fixed: Nested types.}
% \begin{macrocode}
- \renewcommand{\KFLT@type}{#2}%
+ \ifbool{KFLT@inkeysubfloats}%
+ {\renewcommand{\KFLT@type}{\@captype}}%
+ {\renewcommand{\KFLT@type}{#2}}%
% \end{macrocode}
% Set the shared keys. Expansion seems to be required for \pkg{xkeyval}.
% \begin{macrocode}
@@ -4292,9 +4324,6 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \changes{v2.02}{2021/05/18}{Work with \pkg{float}.}
% \begin{macrocode}
\ifcsdef{ftype@#3}{}{%
-% \end{macrocode}
-%
-% \begin{macrocode}
\PackageError{keyfloat}%
{%
\protect\keyflt: Invalid float type.\MessageBreak%
@@ -4305,6 +4334,9 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
Check argument order and float type.
}%
}%
+% \end{macrocode}
+%
+% \begin{macrocode}
\KFLT@ignorespaces%
\KFLT@trackrows%
\KFLT@boxkeys{#4}{#3}%
@@ -4328,6 +4360,14 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% This may be used by itself, or inside a \env{keyfloats} or
% \env{keysubtabs} environment.
%
+% \shownesting{\cs{keyflt}}{
+% \shownesting{\cs{KFLT@keyflt}}{
+% \shownesting{\env{KFLT@boxouter}}{
+% \showKFLTboxinner{Contents}
+% }
+% }
+% }
+%
% \changes{v0.12}{2016/12/03}{Group around contents.}
% \changes{v2.00}{2019/03/17}{Added.}
% \begin{macrocode}
@@ -4366,6 +4406,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \subsection{The \env{keyfloat} environment}
% \begin{macro}{\KFLT@keyfloatstart} \marg{star?} \marg{loc} \marg{float type} \marg{\keyvalsarg}
+%
% \changes{v2.00}{2019/03/18}{Factored.}
% \begin{macrocode}
\newcommand{\KFLT@keyfloatstart}[4]{%
@@ -4389,6 +4430,16 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{macro}
% \begin{environment}{keyfloat} * \oarg{loc} \marg{float type} \marg{\keyvalsarg}
+%
+% \shownesting{\env{keyfloat}}{
+% \shownesting{\cs{KFLT@keyfloatstart}, \cs{KFLT@keyfloatend}}
+% {
+% \shownesting{\env{KFLT@boxouter}}{
+% \showKFLTboxinner{Contents}
+% }
+% }
+% }
+%
% \changes{v2.00}{2019/03/18}{Added.}
% \begin{macrocode}
\NewDocumentEnvironment{keyfloat}{s O{tbp} m +m}
@@ -4416,6 +4467,16 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \subsection{The \env{keyfigure} environment}
% \begin{environment}{keyfigure} * \oarg{loc} \marg{\keyvalsarg}
+%
+% \shownesting{\env{keyfigure}}{
+% \shownesting{\cs{KFLT@keyfloatstart}, \cs{KFLT@keyfloatend}}
+% {
+% \shownesting{\env{KFLT@boxouter}}{
+% \showKFLTboxinner{Contents}
+% }
+% }
+% }
+%
% \begin{macrocode}
\NewDocumentEnvironment{keyfigure}{s O{tbp} +m}
{%
@@ -4447,6 +4508,32 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% This may be used by itself, or inside a \env{keyfloats} or
% \env{keysubfigs} environment.
%
+% \shownesting{\cs{keyfig}}{
+% \shownesting{\cs{KFLT@keyflt}}{
+% \shownesting{\env{KFLT@boxouter}}{
+% \shownesting{
+% \begin{description}
+% \item[If \env{keysubfloats}:]
+% Uses a \env{subfigure}.
+% \item[If {[}H{]}, \env{keyfloats}, or inside a \env{keywrap}:]
+% Uses a \env{minipage}.
+% \item[If {[}W{]}:]
+% Uses a \env{wrapfloat} from the \pkg{wrapfig} package.
+% \item[If {[}M{]}:]
+% Uses a \env{KFLT@marginfloat}.
+% \item[Otherwise:]
+% Uses a \env{figure}.
+% \end{description}
+% }
+% {
+% \shownesting{\cs{KFLT@onefigureimage}}{
+% Rotate, frame, \cs{includegraphics}.
+% }
+% }
+% }
+% }
+% }
+%
% \changes{v2.00}{2019/03/17}{Factored.}
% \begin{macrocode}
\NewDocumentCommand{\keyfig}{s O{tbp} +m m}
@@ -4468,6 +4555,12 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% This may be used by itself, or inside a \env{keyfloats} or
% \env{keysubtabs} environment.
%
+% \shownesting{\cs{keyfigbox}}{
+% \shownesting{\env{KFLT@boxouter}}{
+% \showKFLTboxinner{Contents}
+% }
+% }
+%
% \changes{v0.12}{2016/12/03}{Group around contents.}
% \begin{macrocode}
\NewDocumentCommand{\keyfigbox}{s O{tbp} +m +m}
@@ -4534,6 +4627,16 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% This may be used by itself, or inside a \env{keyfloats} or
% \env{keysubtabs} environment.
%
+% \shownesting{\cs{keytab}}{
+% \shownesting{\cs{keyflt}}{
+% \shownesting{\cs{KFLT@keyflt}}{
+% \shownesting{\env{KFLT@boxouter}}{
+% \showKFLTboxinner{Contents}
+% }
+% }
+% }
+% }
+%
% \changes{v2.00}{2019/03/17}{Factored.}
% \begin{macrocode}
\NewDocumentCommand{\keytab}{s O{tbp} +m +m}
@@ -4551,6 +4654,15 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \subsection{The \env{keytable} environment}
% \begin{environment}{keytable} * \oarg{loc} \marg{\keyvalsarg}
+%
+% \shownesting{\env{keytable}}{
+% \shownesting{\cs{KFLT@keyfloatstart}, \cs{KFLT@keyfloatend}}{
+% \shownesting{\env{KFLT@boxouter}}{
+% \showKFLTboxinner{Contents}
+% }
+% }
+% }
+%
% \begin{macrocode}
\NewDocumentEnvironment{keytable}{s O{tbp} +m}
{%
@@ -4623,7 +4735,6 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{macrocode}
% \end{environment}
-
% \begin{environment}{keyfloats} * \oarg{loc} \marg{num columns} \oarg{shared keys/values}
%
% User-level macro to create rows of figures/tables.
@@ -4641,6 +4752,19 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% Likewise, manually-selected |w| width and |h| tags may need to be
% adjusted to prevent overflow.
%
+% \shownesting{\env{keyfloats}}
+% {
+% \shownesting{
+% \begin{description}
+% \item[If {[}H{]}, nested, subfloats, or \env{keywrap}:]
+% Uses a \env{minipage}.
+% \item[If {[}W{]}:] Uses a \env{wrapfloat}.
+% \item[If {[}M{]}:] Uses \cs{KFLT@marginfloat}.
+% \item[Otherwise:] Uses a \env{figure}.
+% \end{description}
+% }{Contents}
+% }
+%
% \changes{v0.15}{2017/05/12}{Adjustments for \protect\env{keywrap}.}
%
% \begin{macrocode}
@@ -4901,6 +5025,19 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \begin{macro}{\KFLT@subfloats} \marg{starred?} \marg{loc} \marg{cols} \marg{\keyvalsarg}
%
+% \shownesting{\cs{KFLT@subfloats}, \cs{KTLT@endsubfloats}}
+% {
+% \shownesting{
+% \begin{description}
+% \item[If {[}H{]} or \env{keywrap}:] Uses a \env{minipage}.
+% \item[If {[}W{]}:] Uses a \env{wrapfloat} and a \env{minipage}.
+% \item[If {[}M{]}:] Uses \cs{KFLT@marginfloat}.
+% \item[Otherwise:] Uses a \env{subfigure}, etc.
+% \end{description}
+% }
+% {Contents}
+% }
+%
% \changes{v0.13}{2017/01/16}{Fix: Subfloat type selection.}
% \changes{v0.15}{2017/05/12}{Adjustments for \protect\env{keywrap}.}
%
@@ -5099,6 +5236,22 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%
% A group of subfigures typeset in rows.
%
+% \shownesting{\env{KFLT@keysubfloats}}
+% {
+% \shownesting{\cs{KFLT@subfloats}, \cs{KFLT@endsubfloats}}
+% {
+% \shownesting{
+% \begin{description}
+% \item[If {[}H{]} or \env{keywrap}:] Uses a \env{minipage}.
+% \item[If {[}W{]}:] Uses a \env{wrapfloat} and a \env{minipage}.
+% \item[If {[}M{]}:] Uses \cs{KFLT@marginfloat}.
+% \item[Otherwise:] Uses a \env{subfigure}, etc.
+% \end{description}
+% }
+% {Contents}
+% }
+% }
+%
% \begin{macrocode}
\NewDocumentEnvironment{KFLT@keysubfloats}{m m m m +m m}
{%
@@ -5136,13 +5289,33 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
}
% \end{macrocode}
% \end{environment}
-
-
+%
+%
+%
% \begin{environment}{keysubfloats} * \oarg{2: loc} \marg{3: float type}
% \marg{4: numcols} \marg{5: \keyvalsarg} \oarg{6: shared \keyvalsarg}
%
% A group of subfloats typeset in rows.
%
+% \shownesting{\env{keysubfloats}, \env{keysubfigs}, or \env{keysubtabs}}
+% {
+% \shownesting{\env{KFLT@keysubfloats}}
+% {
+% \shownesting{\cs{KFLT@subfloats}, \cs{KFLT@endsubfloats}}
+% {
+% \shownesting{
+% \begin{description}
+% \item[If {[}H{]} or \env{keywrap}:] Uses a \env{minipage}.
+% \item[If {[}W{]}:] Uses a \env{wrapfloat} and a \env{minipage}.
+% \item[If {[}M{]}:] Uses \cs{KFLT@marginfloat}.
+% \item[Otherwise:] Uses a \env{subfigure}, etc.
+% \end{description}
+% }
+% {Contents}
+% }
+% }
+% }
+%
% \changes{v2.06}{2021/06/25}{Added shared keys.}
% \begin{macrocode}
\NewDocumentEnvironment{keysubfloats}{s O{tbp} m m +m O{}}
@@ -5184,6 +5357,13 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \subsection{Margin floats}
%
% \begin{environment}{KFLT@marginfloat} \oarg{offset} \marg{type}
+%
+% \shownesting{\env{KFLT@marginfloat}}
+% {
+% \shownesting{\cs{marginpar}}
+% {\shownesting{\env{minipage}}{Contents}}
+% }
+%
% \changes{v2.01}{2019/09/11}{Fix: Font and color.}
% \begin{macrocode}
\newsavebox{\KFLT@marginfloatbox}
@@ -5212,6 +5392,17 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% Provided in case \pkg{tufte-book} is not loaded:
%
% \begin{environment}{marginfigure} \oarg{offset}
+%
+% \shownesting{\env{marginfigure}}
+% {
+% \shownesting{\env{KFLT@marginfloat}}
+% {
+% \shownesting{\cs{marginpar}}
+% {\shownesting{\env{minipage}}{Contents}}
+% }
+% }
+%
+%
% \changes{v0.12}{2016/12/03}{Added.}
% \begin{macrocode}
\ProvideDocumentEnvironment{marginfigure}{O{-1.2ex}}
@@ -5258,11 +5449,22 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{macrocode}
%
%
-% \begin{environment}{keywrap} \marg{width} \marg{keyfloat}
+% \begin{environment}{keywrap} \marg{width} \marg{wrapped content}
%
% The main text is placed in a minipage to the left,
% and the wrapped content is later placed in another minipage to the right.
%
+% \shownesting{\env{keywrap}}
+% {
+% \shownesting[.4]{\env{minipage}}
+% {Main text.\newline Multiple paragraphs.}
+% \hfill
+% \cs{hfill}
+% \hfill
+% \shownesting*[.35]{\env{minipage}}
+% {Wrapped content.}
+% }
+%
% \changes{v0.15}{2017/05/11}{Added.}
% \changes{v2.01}{2019/09/11}{Fix: Font and color.}
% \changes{v2.01}{2019/09/16}{Fix: \cs{noindent}.}
@@ -5310,10 +5512,12 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{environment}
%
%
+% \clearpage
+%
% \section{\pkg{keyfloat} package maintenance}
%
-% To compile the \pkg{keyfloat} documentation from \filenm{keyfloat.dtx} and
-% \filenm{keyfloat.ins}:
+% To compile \filenm{keyfloat.sty} and \cs{keyfloat.pdf}
+% from \filenm{keyfloat.dtx} and \filenm{keyfloat.ins}:
%
% \begin{sourceverb}
% pdflatex keyfloat.ins
diff --git a/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty b/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty
index 5b90a20a7c3..955446ff7e4 100644
--- a/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty
+++ b/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{keyfloat}
- [2021/06/29 v2.06 Key/value interface for floats and subfloats.]
+ [2022/01/10 v2.07 Key/value interface for floats and subfloats.]
@@ -351,10 +351,20 @@
\newcommand{\KFLT@frame}[1]
{%
\ifbool{KFLT@ft}%
- {\KFLTtightframe{#1}}%
+ {%
+ {%
+ \hfuzz=\linewidth%
+ \KFLTtightframe{#1}%
+ }%
+ }%
{% not tightframe
\ifbool{KFLT@f}%
- {\KFLTlooseframe{#1}}%
+ {%
+ {%
+ \hfuzz=\linewidth%
+ \KFLTlooseframe{#1}%
+ }%
+ }%
{#1}% no frame
}% not looseframe
}
@@ -742,7 +752,9 @@
\NewDocumentCommand{\KFLT@boxkeys}{+m m}
{%
\KFLT@defaults%
- \renewcommand{\KFLT@type}{#2}%
+ \ifbool{KFLT@inkeysubfloats}%
+ {\renewcommand{\KFLT@type}{\@captype}}%
+ {\renewcommand{\KFLT@type}{#2}}%
\edef\next{\noexpand\setkeys{KFLT@keys}{\KFLT@sharedkeys}}%
\next%
\setkeys{KFLT@keys}{#1}%
@@ -1293,7 +1305,6 @@
{%
\KFLT@endsubfloats{#1}{#2}%
}
-
\NewDocumentEnvironment{keysubfloats}{s O{tbp} m m +m O{}}
{\KFLT@keysubfloats{#1}{#2}{#3}{#4}{#5}{#6}}
{\endKFLT@keysubfloats}