texlive[61561] Master/texmf-dist: keyfloat (10jan22)

commits+karl at tug.org commits+karl at tug.org
Mon Jan 10 22:28:11 CET 2022


Revision: 61561
          http://tug.org/svn/texlive?view=revision&revision=61561
Author:   karl
Date:     2022-01-10 22:28:10 +0100 (Mon, 10 Jan 2022)
Log Message:
-----------
keyfloat (10jan22)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt
    trunk/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf
    trunk/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx
    trunk/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty

Modified: trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt	2022-01-10 21:27:56 UTC (rev 61560)
+++ trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt	2022-01-10 21:28:10 UTC (rev 61561)
@@ -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
 

Modified: trunk/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx	2022-01-10 21:27:56 UTC (rev 61560)
+++ trunk/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx	2022-01-10 21:28:10 UTC (rev 61561)
@@ -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 @@
 \pagestyle{pageheadfoot}
 
 
-\usepackage{dtxdescribe}[2019/01/11]
+% Indexing, logos, \Describexxxx, etc:
+\usepackage{dtxdescribe}[2021/09/02]
 
 
 
@@ -349,7 +339,7 @@
 %<*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 @@
 % \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 @@
 %
 % \bigskip
 %
-% {\small\textcopyright{} 2016--2021} Brian Dunn\\ \small \texttt{bd at BDTechConcepts.com}
+% {\small\textcopyright{} 2016--2022} Brian Dunn\\ \small \texttt{bd at BDTechConcepts.com}
 %
 % \vspace{.5in}
 %
@@ -1675,19 +1667,15 @@
 %       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 @@
 % \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 @@
 %
 % \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 @@
 % \section{Code}
 % ^^A *source
 %
+%
+%
+%
 % \subsection{Older packages}
 %
 % Ensure that \pkg{tocdata}, if loaded, is new enough:
@@ -2218,6 +2209,10 @@
 % 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 @@
 % \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 @@
 % \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 @@
 %
 % 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 @@
 % \begin{macro}{\KFLT at 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 at frame}[1]
 {%
     \ifbool{KFLT at ft}%
-        {\KFLTtightframe{#1}}%
+        {%
+            {%
+                \hfuzz=\linewidth%
+                \KFLTtightframe{#1}%
+            }%
+        }%
         {% not tightframe
             \ifbool{KFLT at f}%
-                {\KFLTlooseframe{#1}}%
+                {%
+                    {%
+                        \hfuzz=\linewidth%
+                        \KFLTlooseframe{#1}%
+                    }%
+                }%
                 {#1}% no frame
         }% not looseframe
 }
@@ -3214,6 +3221,15 @@
 %
 % Create an image with size, frame, and turn.
 %
+% \shownesting{\cs{KFLT at onefigureimage}}
+% {
+%   \shownesting{\env{turn}}
+%   {
+%       \shownesting{\cs{KFLT at frame} $\to$ \cs{fbox}}
+%           {\cs{KFLT at includegraphics}}
+%   }
+% }
+%
 % \changes{v2.00}{2019/03/12}{Filename in arg instead of \cs{KFLT at i}.}
 % \changes{v2.06}{2021/06/25}{Added \optn{kar}.}
 %    \begin{macrocode}
@@ -3871,9 +3887,22 @@
 %    \end{macrocode}
 
 
+% \newcommand*{\showKFLTboxinner}[1]{%
+% \shownesting{\env{KFLT at boxinner}}{
+%   \shownesting{\cs{KFLT at frame} $\to$ \cs{fbox}}
+%   {
+%       \shownesting{\env{turn}}
+%           {\shownesting{\env{minipage}}{#1}}
+%   }
+% }
+% }
+%
 % \begin{environment}{KFLT at boxinner}
 %
 % Typeset the contents in a width which depends on the keys.
+%
+% \showKFLTboxinner{Contents}
+%
 %    \begin{macrocode}
 \newsavebox{\KFLT at envbox}
 
@@ -3940,8 +3969,11 @@
     \KFLT at defaults%
 %    \end{macrocode}
 % Remember the float type:
+% \changes{v2.07}{2022/01/06}{Fixed: Nested types.}
 %    \begin{macrocode}
-    \renewcommand{\KFLT at type}{#2}%
+    \ifbool{KFLT at inkeysubfloats}%
+        {\renewcommand{\KFLT at type}{\@captype}}%
+        {\renewcommand{\KFLT at type}{#2}}%
 %    \end{macrocode}
 % Set the shared keys.  Expansion seems to be required for \pkg{xkeyval}.
 %    \begin{macrocode}
@@ -4292,9 +4324,6 @@
 % \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 @@
             Check argument order and float type.
         }%
     }%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
     \KFLT at ignorespaces%
     \KFLT at trackrows%
     \KFLT at boxkeys{#4}{#3}%
@@ -4328,6 +4360,14 @@
 % This may be used by itself, or inside a \env{keyfloats} or
 % \env{keysubtabs} environment.
 %
+% \shownesting{\cs{keyflt}}{
+%   \shownesting{\cs{KFLT at keyflt}}{
+%       \shownesting{\env{KFLT at 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 @@
 % \subsection{The \env{keyfloat} environment}
 
 % \begin{macro}{\KFLT at keyfloatstart} \marg{star?} \marg{loc} \marg{float type} \marg{\keyvalsarg}
+%
 % \changes{v2.00}{2019/03/18}{Factored.}
 %    \begin{macrocode}
 \newcommand{\KFLT at keyfloatstart}[4]{%
@@ -4389,6 +4430,16 @@
 % \end{macro}
 
 % \begin{environment}{keyfloat} * \oarg{loc} \marg{float type} \marg{\keyvalsarg}
+%
+% \shownesting{\env{keyfloat}}{
+%   \shownesting{\cs{KFLT at keyfloatstart}, \cs{KFLT at keyfloatend}}
+%   {
+%       \shownesting{\env{KFLT at boxouter}}{
+%           \showKFLTboxinner{Contents}
+%       }
+%   }
+% }
+%
 % \changes{v2.00}{2019/03/18}{Added.}
 %    \begin{macrocode}
 \NewDocumentEnvironment{keyfloat}{s O{tbp} m +m}
@@ -4416,6 +4467,16 @@
 % \subsection{The \env{keyfigure} environment}
 
 % \begin{environment}{keyfigure} * \oarg{loc} \marg{\keyvalsarg}
+%
+% \shownesting{\env{keyfigure}}{
+%   \shownesting{\cs{KFLT at keyfloatstart}, \cs{KFLT at keyfloatend}}
+%   {
+%       \shownesting{\env{KFLT at boxouter}}{
+%           \showKFLTboxinner{Contents}
+%       }
+%   }
+% }
+%
 %    \begin{macrocode}
 \NewDocumentEnvironment{keyfigure}{s O{tbp} +m}
 {%
@@ -4447,6 +4508,32 @@
 % This may be used by itself, or inside a \env{keyfloats} or
 % \env{keysubfigs} environment.
 %
+% \shownesting{\cs{keyfig}}{
+%   \shownesting{\cs{KFLT at keyflt}}{
+%         \shownesting{\env{KFLT at 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 at marginfloat}.
+%                 \item[Otherwise:]
+%                     Uses a \env{figure}.
+%                 \end{description}
+%             }
+%             {
+%                 \shownesting{\cs{KFLT at 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 @@
 % This may be used by itself, or inside a \env{keyfloats} or
 % \env{keysubtabs} environment.
 %
+% \shownesting{\cs{keyfigbox}}{
+%   \shownesting{\env{KFLT at 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 @@
 % This may be used by itself, or inside a \env{keyfloats} or
 % \env{keysubtabs} environment.
 %
+% \shownesting{\cs{keytab}}{
+%   \shownesting{\cs{keyflt}}{
+%       \shownesting{\cs{KFLT at keyflt}}{
+%           \shownesting{\env{KFLT at boxouter}}{
+%               \showKFLTboxinner{Contents}
+%           }
+%       }
+%   }
+% }
+%
 % \changes{v2.00}{2019/03/17}{Factored.}
 %    \begin{macrocode}
 \NewDocumentCommand{\keytab}{s O{tbp} +m +m}
@@ -4551,6 +4654,15 @@
 % \subsection{The \env{keytable} environment}
 
 % \begin{environment}{keytable} * \oarg{loc} \marg{\keyvalsarg}
+%
+% \shownesting{\env{keytable}}{
+%   \shownesting{\cs{KFLT at keyfloatstart}, \cs{KFLT at keyfloatend}}{
+%       \shownesting{\env{KFLT at boxouter}}{
+%           \showKFLTboxinner{Contents}
+%       }
+%   }
+% }
+%
 %    \begin{macrocode}
 \NewDocumentEnvironment{keytable}{s O{tbp} +m}
 {%
@@ -4623,7 +4735,6 @@
 %    \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 @@
 % 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 at 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 @@
 
 % \begin{macro}{\KFLT at subfloats} \marg{starred?} \marg{loc} \marg{cols} \marg{\keyvalsarg}
 %
+% \shownesting{\cs{KFLT at subfloats}, \cs{KTLT at 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 at 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 @@
 %
 % A group of subfigures typeset in rows.
 %
+% \shownesting{\env{KFLT at keysubfloats}}
+%   {
+%       \shownesting{\cs{KFLT at subfloats}, \cs{KFLT at 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 at marginfloat}.
+%               \item[Otherwise:] Uses a \env{subfigure}, etc.
+%               \end{description}
+%           }
+%           {Contents}
+%       }
+%   }
+%
 %    \begin{macrocode}
 \NewDocumentEnvironment{KFLT at keysubfloats}{m m m m +m m}
 {%
@@ -5136,13 +5289,33 @@
 }
 %    \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 at keysubfloats}}
+%       {
+%           \shownesting{\cs{KFLT at subfloats}, \cs{KFLT at 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 at 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 @@
 % \subsection{Margin floats}
 %
 % \begin{environment}{KFLT at marginfloat} \oarg{offset} \marg{type}
+%
+% \shownesting{\env{KFLT at marginfloat}}
+%   {
+%       \shownesting{\cs{marginpar}}
+%           {\shownesting{\env{minipage}}{Contents}}
+%   }
+%
 % \changes{v2.01}{2019/09/11}{Fix: Font and color.}
 %    \begin{macrocode}
 \newsavebox{\KFLT at marginfloatbox}
@@ -5212,6 +5392,17 @@
 % Provided in case \pkg{tufte-book} is not loaded:
 %
 % \begin{environment}{marginfigure} \oarg{offset}
+%
+% \shownesting{\env{marginfigure}}
+%   {
+%       \shownesting{\env{KFLT at 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 @@
 %    \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 @@
 % \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

Modified: trunk/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty	2022-01-10 21:27:56 UTC (rev 61560)
+++ trunk/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty	2022-01-10 21:28:10 UTC (rev 61561)
@@ -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 at frame}[1]
 {%
     \ifbool{KFLT at ft}%
-        {\KFLTtightframe{#1}}%
+        {%
+            {%
+                \hfuzz=\linewidth%
+                \KFLTtightframe{#1}%
+            }%
+        }%
         {% not tightframe
             \ifbool{KFLT at f}%
-                {\KFLTlooseframe{#1}}%
+                {%
+                    {%
+                        \hfuzz=\linewidth%
+                        \KFLTlooseframe{#1}%
+                    }%
+                }%
                 {#1}% no frame
         }% not looseframe
 }
@@ -742,7 +752,9 @@
 \NewDocumentCommand{\KFLT at boxkeys}{+m m}
 {%
     \KFLT at defaults%
-    \renewcommand{\KFLT at type}{#2}%
+    \ifbool{KFLT at inkeysubfloats}%
+        {\renewcommand{\KFLT at type}{\@captype}}%
+        {\renewcommand{\KFLT at type}{#2}}%
     \edef\next{\noexpand\setkeys{KFLT at keys}{\KFLT at sharedkeys}}%
     \next%
     \setkeys{KFLT at keys}{#1}%
@@ -1293,7 +1305,6 @@
 {%
     \KFLT at endsubfloats{#1}{#2}%
 }
-
 \NewDocumentEnvironment{keysubfloats}{s O{tbp} m m +m O{}}
     {\KFLT at keysubfloats{#1}{#2}{#3}{#4}{#5}{#6}}
     {\endKFLT at keysubfloats}



More information about the tex-live-commits mailing list.