From 192d22452649953af7f53ebf1d9930314461192c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Feb 2017 23:27:51 +0000 Subject: keyfloat (10feb17) git-svn-id: svn://tug.org/texlive/trunk@43181 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/keyfloat/README | 24 ------ Master/texmf-dist/doc/latex/keyfloat/README.txt | 25 ++++++ .../texmf-dist/doc/latex/keyfloat/images/image.svg | 76 ------------------ .../doc/latex/keyfloat/images/image2.svg | 85 --------------------- Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf | Bin 869213 -> 869171 bytes .../texmf-dist/source/latex/keyfloat/keyfloat.dtx | 20 +++-- Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty | 10 ++- 7 files changed, 47 insertions(+), 193 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/keyfloat/README create mode 100644 Master/texmf-dist/doc/latex/keyfloat/README.txt delete mode 100644 Master/texmf-dist/doc/latex/keyfloat/images/image.svg delete mode 100644 Master/texmf-dist/doc/latex/keyfloat/images/image2.svg diff --git a/Master/texmf-dist/doc/latex/keyfloat/README b/Master/texmf-dist/doc/latex/keyfloat/README deleted file mode 100644 index 199f41cde1a..00000000000 --- a/Master/texmf-dist/doc/latex/keyfloat/README +++ /dev/null @@ -1,24 +0,0 @@ -The LaTeX keyfloat package -Provides a key/value interface for generating floats. - -v0.13 — 2017/01/18 -Copyright 2016 Brian Dunn — www.BDTechConcepts.com -LaTeX Project Public License, version 1.3 - -The keyfloat package provides a key/value user interface for quickly creating -figures with a single image each, figures with arbitrary contents, tables, -subfloats, rows of floats, floats located [H]ere, floats in the [M]argin, and -floats with text [W]rapped around them. - -Key/value combinations may specify a caption and label, a width propor- -tional to \linewidth, a fixed width and/or height, rotation, scaling, a tight -or loose frame, an \arraystretch, a continued float, additional supplemental -text, and an artist/author's name with automatic index entry. When used -with the tocdata package, the name also appears in the List of Figures. - -Floats may be placed into a row environment, and are typeset to fit within -the given number of columns, continuing to the next row if necessary. Nested -sub-rows may be used to generate layouts such as two small figures placed -vertically next to one larger figure. - -Subfloats are supported by two environments. diff --git a/Master/texmf-dist/doc/latex/keyfloat/README.txt b/Master/texmf-dist/doc/latex/keyfloat/README.txt new file mode 100644 index 00000000000..e121e6e9127 --- /dev/null +++ b/Master/texmf-dist/doc/latex/keyfloat/README.txt @@ -0,0 +1,25 @@ +The LaTeX keyfloat package +Provides a key/value interface for generating floats. + +v0.14 — 2017/02/09 +Copyright 2016 Brian Dunn — www.BDTechConcepts.com + +LaTeX Project Public License, version 1.3 + +The keyfloat package provides a key/value user interface for quickly creating +figures with a single image each, figures with arbitrary contents, tables, +subfloats, rows of floats, floats located [H]ere, floats in the [M]argin, and +floats with text [W]rapped around them. + +Key/value combinations may specify a caption and label, a width propor- +tional to \linewidth, a fixed width and/or height, rotation, scaling, a tight +or loose frame, an \arraystretch, a continued float, additional supplemental +text, and an artist/author's name with automatic index entry. When used +with the tocdata package, the name also appears in the List of Figures. + +Floats may be placed into a row environment, and are typeset to fit within +the given number of columns, continuing to the next row if necessary. Nested +sub-rows may be used to generate layouts such as two small figures placed +vertically next to one larger figure. + +Subfloats are supported by two environments. diff --git a/Master/texmf-dist/doc/latex/keyfloat/images/image.svg b/Master/texmf-dist/doc/latex/keyfloat/images/image.svg deleted file mode 100644 index f2794584d8f..00000000000 --- a/Master/texmf-dist/doc/latex/keyfloat/images/image.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - An image. - - - diff --git a/Master/texmf-dist/doc/latex/keyfloat/images/image2.svg b/Master/texmf-dist/doc/latex/keyfloat/images/image2.svg deleted file mode 100644 index c987b28402a..00000000000 --- a/Master/texmf-dist/doc/latex/keyfloat/images/image2.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - Anotherimage - - diff --git a/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf b/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf index 67492e2783a..b084201a756 100644 Binary files a/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf and b/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf differ diff --git a/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx b/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx index 848e2bd37f9..0379749ae14 100644 --- a/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx +++ b/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx @@ -17,7 +17,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{keyfloat} -% [2017/01/18 v0.13 Key/value interface for floats and the subcaption package.] +% [2017/02/09 v0.14 Key/value interface for floats and the subcaption package.] % %<*driver> \documentclass{ltxdoc} @@ -316,7 +316,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}% %<*package> % \fi % -% \CheckSum{1021} +% \CheckSum{1022} % % \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 @@ -341,6 +341,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}% % \changes{v0.12}{2016/12/05}{Docs: Improved index.} % \changes{v0.13}{2017/01/18}{\ 2017/01/18} % \changes{v0.13}{2017/01/12}{Docs: Other Settings.} +% \changes{v0.14}{2017/02/09}{\ 2017/02/09} @@ -2600,8 +2601,9 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % See Table \ref{tab:captions} for the possible combinations of % the caption-related keys: |c|, |cstar|, and |sc|. -% \begin{macrocode} -% \end{macrocode} +% +% \changes{v0.14}{2017/02/09}{Fix: No index entry if no artist given.} +% % There are two versions, depending on whether \pkg{tocdata} is loaded. % \begin{macrocode} \@ifpackageloaded{tocdata} @@ -2665,11 +2667,15 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % \begin{macrocode} \KFLT@dosimplecaption{#1}{#2}{#3}% % \end{macrocode} -% Create an index entry depending on whether there is a first name: +% Create an index entry depending on whether there is a last, first name: % \begin{macrocode} +\ifcsempty{KFLT@#4al}% +{}% no artist +{% yes artist \ifcsempty{KFLT@#4af}% {\index{\csname KFLT@#4al\endcsname}}% {\index{\csname KFLT@#4al\endcsname, \csname KFLT@#4af\endcsname}}% +}% yes artist }% KFLT@docaption }% no tocdata % \end{macrocode} @@ -3207,7 +3213,9 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % If are inside \env{keysubtabs}, end the subtable: % \begin{macrocode} \ifthenelse{\boolean{KFLT@inkeysubfloats}}% -{\csname endsub\KFLT@type\endcsname}% subfloat +{ +\csname endsub\KFLT@type\endcsname +}% subfloat {% not subfloat \ifthenelse{\cnttest{\value{KFLT@keyfloatdepth}}>{0}}% keyfloats? {\endminipage}% keyfloats diff --git a/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty b/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty index 533b436555f..bfb62f07a9b 100644 --- a/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty +++ b/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{keyfloat} - [2017/01/18 v0.13 Key/value interface for floats and the subcaption package.] + [2017/02/09 v0.14 Key/value interface for floats and the subcaption package.] @@ -380,9 +380,13 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \NewDocumentCommand{\KFLT@docaption}{s o m m} {% \KFLT@dosimplecaption{#1}{#2}{#3}% +\ifcsempty{KFLT@#4al}% +{}% no artist +{% yes artist \ifcsempty{KFLT@#4af}% {\index{\csname KFLT@#4al\endcsname}}% {\index{\csname KFLT@#4al\endcsname, \csname KFLT@#4af\endcsname}}% +}% yes artist }% KFLT@docaption }% no tocdata @@ -613,7 +617,9 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% \KFLT@addartisttext{}% \KFLT@captioniftype{figure}{}% \ifthenelse{\boolean{KFLT@inkeysubfloats}}% -{\csname endsub\KFLT@type\endcsname}% subfloat +{ +\csname endsub\KFLT@type\endcsname +}% subfloat {% not subfloat \ifthenelse{\cnttest{\value{KFLT@keyfloatdepth}}>{0}}% keyfloats? {\endminipage}% keyfloats -- cgit v1.2.3