texlive[43181] Master/texmf-dist: keyfloat (10feb17)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 11 00:27:51 CET 2017
Revision: 43181
http://tug.org/svn/texlive?view=revision&revision=43181
Author: karl
Date: 2017-02-11 00:27:51 +0100 (Sat, 11 Feb 2017)
Log Message:
-----------
keyfloat (10feb17)
Modified Paths:
--------------
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
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/keyfloat/README
trunk/Master/texmf-dist/doc/latex/keyfloat/images/image.svg
trunk/Master/texmf-dist/doc/latex/keyfloat/images/image2.svg
Deleted: trunk/Master/texmf-dist/doc/latex/keyfloat/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/keyfloat/README 2017-02-10 21:43:21 UTC (rev 43180)
+++ trunk/Master/texmf-dist/doc/latex/keyfloat/README 2017-02-10 23:27:51 UTC (rev 43181)
@@ -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.
Added: trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/keyfloat/README.txt 2017-02-10 23:27:51 UTC (rev 43181)
@@ -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.
Deleted: trunk/Master/texmf-dist/doc/latex/keyfloat/images/image.svg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/keyfloat/images/image.svg 2017-02-10 21:43:21 UTC (rev 43180)
+++ trunk/Master/texmf-dist/doc/latex/keyfloat/images/image.svg 2017-02-10 23:27:51 UTC (rev 43181)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="49.831249"
- height="19.308453"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="image.pdf">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.6"
- inkscape:cx="12.423968"
- inkscape:cy="-19.541387"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="3"
- fit-margin-left="3"
- fit-margin-right="3"
- fit-margin-bottom="3"
- inkscape:window-width="1914"
- inkscape:window-height="1126"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-322.77429,-458.49648)">
- <text
- xml:space="preserve"
- style="font-size:10px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Libertinus Serif;-inkscape-font-specification:Libertinus Serif Bold Italic"
- x="325.71429"
- y="468.07648"
- id="text2985"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan2987"
- x="325.71429"
- y="468.07648">An image.</tspan></text>
- <path
- style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 331.33004,470.76685 33.33503,1.51523 -32.57742,1.76777 27.52666,0.50508"
- id="path3001"
- inkscape:connector-curvature="0" />
- </g>
-</svg>
Deleted: trunk/Master/texmf-dist/doc/latex/keyfloat/images/image2.svg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/keyfloat/images/image2.svg 2017-02-10 21:43:21 UTC (rev 43180)
+++ trunk/Master/texmf-dist/doc/latex/keyfloat/images/image2.svg 2017-02-10 23:27:51 UTC (rev 43181)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="52.571426"
- height="34"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="image.svg">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.6"
- inkscape:cx="21.536983"
- inkscape:cy="21.62295"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="3"
- fit-margin-left="3"
- fit-margin-right="3"
- fit-margin-bottom="3"
- inkscape:window-width="1914"
- inkscape:window-height="1126"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-333.36358,-483.84064)">
- <path
- sodipodi:type="arc"
- style="fill:#e6e6e6;stroke:#000000;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
- id="path3049"
- sodipodi:cx="37.94643"
- sodipodi:cy="40.379883"
- sodipodi:rx="23.035713"
- sodipodi:ry="13.749999"
- d="m 60.982143,40.379883 c 0,7.593915 -10.31344,13.749999 -23.035713,13.749999 -12.722273,0 -23.035713,-6.156084 -23.035713,-13.749999 0,-7.593915 10.31344,-13.749999 23.035713,-13.749999 12.722273,0 23.035713,6.156084 23.035713,13.749999 z"
- transform="translate(321.70286,460.46076)" />
- <text
- xml:space="preserve"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:TeX Gyre Heros;-inkscape-font-specification:TeX Gyre Heros"
- x="359.62921"
- y="498.57422"
- id="text3039"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3041"
- x="359.62921"
- y="498.57422">Another</tspan><tspan
- sodipodi:role="line"
- x="359.62921"
- y="511.07422"
- id="tspan3051">image</tspan></text>
- </g>
-</svg>
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 2017-02-10 21:43:21 UTC (rev 43180)
+++ trunk/Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx 2017-02-10 23:27:51 UTC (rev 43181)
@@ -17,7 +17,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{keyfloat}
-%<package> [2017/01/18 v0.13 Key/value interface for floats and the subcaption package.]
+%<package> [2017/02/09 v0.14 Key/value interface for floats and the subcaption package.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -316,7 +316,7 @@
%<*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 @@
% \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 @@
%
% 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 @@
% \begin{macrocode}
\KFLT at 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 at docaption
}% no tocdata
% \end{macrocode}
@@ -3207,7 +3213,9 @@
% If are inside \env{keysubtabs}, end the subtable:
% \begin{macrocode}
\ifthenelse{\boolean{KFLT at inkeysubfloats}}%
-{\csname endsub\KFLT at type\endcsname}% subfloat
+{
+\csname endsub\KFLT at type\endcsname
+}% subfloat
{% not subfloat
\ifthenelse{\cnttest{\value{KFLT at keyfloatdepth}}>{0}}% keyfloats?
{\endminipage}% keyfloats
Modified: trunk/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty 2017-02-10 21:43:21 UTC (rev 43180)
+++ trunk/Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty 2017-02-10 23:27:51 UTC (rev 43181)
@@ -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 @@
\NewDocumentCommand{\KFLT at docaption}{s o m m}
{%
\KFLT at 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 at docaption
}% no tocdata
@@ -613,7 +617,9 @@
\KFLT at addartisttext{}%
\KFLT at captioniftype{figure}{}%
\ifthenelse{\boolean{KFLT at inkeysubfloats}}%
-{\csname endsub\KFLT at type\endcsname}% subfloat
+{
+\csname endsub\KFLT at type\endcsname
+}% subfloat
{% not subfloat
\ifthenelse{\cnttest{\value{KFLT at keyfloatdepth}}>{0}}% keyfloats?
{\endminipage}% keyfloats
More information about the tex-live-commits
mailing list