summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-10 23:27:51 +0000
committerKarl Berry <karl@freefriends.org>2017-02-10 23:27:51 +0000
commit192d22452649953af7f53ebf1d9930314461192c (patch)
treee024b9fd0f0aa5bf4db08b020a312362803da09c /Master
parentc983da027919dc58f6962b928aace7aaa30f2adb (diff)
keyfloat (10feb17)
git-svn-id: svn://tug.org/texlive/trunk@43181 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/keyfloat/README.txt (renamed from Master/texmf-dist/doc/latex/keyfloat/README)3
-rw-r--r--Master/texmf-dist/doc/latex/keyfloat/images/image.svg76
-rw-r--r--Master/texmf-dist/doc/latex/keyfloat/images/image2.svg85
-rw-r--r--Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdfbin869213 -> 869171 bytes
-rw-r--r--Master/texmf-dist/source/latex/keyfloat/keyfloat.dtx20
-rw-r--r--Master/texmf-dist/tex/latex/keyfloat/keyfloat.sty10
6 files changed, 24 insertions, 170 deletions
diff --git a/Master/texmf-dist/doc/latex/keyfloat/README b/Master/texmf-dist/doc/latex/keyfloat/README.txt
index 199f41cde1a..e121e6e9127 100644
--- a/Master/texmf-dist/doc/latex/keyfloat/README
+++ b/Master/texmf-dist/doc/latex/keyfloat/README.txt
@@ -1,8 +1,9 @@
The LaTeX keyfloat package
Provides a key/value interface for generating floats.
-v0.13 — 2017/01/18
+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
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 @@
-<?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>
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 @@
-<?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>
diff --git a/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf b/Master/texmf-dist/doc/latex/keyfloat/keyfloat.pdf
index 67492e2783a..b084201a756 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 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
%<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 @@ 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