summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/attachfile2/README.md11
-rw-r--r--macros/latex/contrib/attachfile2/attachfile2.dtx (renamed from macros/latex/contrib/oberdiek/attachfile2.dtx)130
-rw-r--r--macros/latex/contrib/attachfile2/attachfile2.pdfbin0 -> 443676 bytes
-rw-r--r--macros/latex/contrib/caption/CHANGELOG18
-rw-r--r--macros/latex/contrib/caption/README11
-rw-r--r--macros/latex/contrib/caption/caption.dtx929
-rw-r--r--macros/latex/contrib/caption/caption.ins15
-rw-r--r--macros/latex/contrib/caption/caption3.dtx723
-rw-r--r--macros/latex/contrib/caption/subcaption.dtx6
-rw-r--r--macros/latex/contrib/caption/subcaption.pdfbin154500 -> 154507 bytes
-rw-r--r--macros/latex/contrib/epstopdf-pkg/README.md20
-rw-r--r--macros/latex/contrib/epstopdf-pkg/epstopdf.dtx (renamed from macros/latex/contrib/oberdiek/epstopdf.dtx)89
-rw-r--r--macros/latex/contrib/epstopdf-pkg/epstopdf.pdfbin0 -> 360058 bytes
-rw-r--r--macros/latex/contrib/footnoterange/README2
-rw-r--r--macros/latex/contrib/footnoterange/footnoterange-example.pdfbin82980 -> 82896 bytes
-rw-r--r--macros/latex/contrib/footnoterange/footnoterange.dtx42
-rw-r--r--macros/latex/contrib/footnoterange/footnoterange.pdfbin319711 -> 320112 bytes
-rw-r--r--macros/latex/contrib/newfloat/CHANGELOG13
-rw-r--r--macros/latex/contrib/newfloat/README38
-rw-r--r--macros/latex/contrib/newfloat/SUMMARY1
-rw-r--r--macros/latex/contrib/newfloat/newfloat.dtx (renamed from macros/latex/contrib/caption/newfloat.dtx)34
-rw-r--r--macros/latex/contrib/newfloat/newfloat.ins42
-rw-r--r--macros/latex/contrib/newfloat/newfloat.pdf (renamed from macros/latex/contrib/caption/newfloat.pdf)bin111038 -> 112077 bytes
-rw-r--r--macros/latex/contrib/oberdiek/README.txt6
-rw-r--r--macros/latex/contrib/oberdiek/accsupp.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/accsupp.pdfbin162282 -> 154721 bytes
-rw-r--r--macros/latex/contrib/oberdiek/aliascnt.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/aliascnt.pdfbin112951 -> 104955 bytes
-rw-r--r--macros/latex/contrib/oberdiek/alphalph.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/alphalph.pdfbin209306 -> 201277 bytes
-rw-r--r--macros/latex/contrib/oberdiek/askinclude.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/askinclude.pdfbin278793 -> 269928 bytes
-rw-r--r--macros/latex/contrib/oberdiek/atbegshi.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/atbegshi.pdfbin246424 -> 236604 bytes
-rw-r--r--macros/latex/contrib/oberdiek/atenddvi.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/atenddvi.pdfbin105613 -> 98072 bytes
-rw-r--r--macros/latex/contrib/oberdiek/attachfile2.pdfbin276137 -> 0 bytes
-rw-r--r--macros/latex/contrib/oberdiek/atveryend.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/atveryend.pdfbin197514 -> 189909 bytes
-rw-r--r--macros/latex/contrib/oberdiek/auxhook.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/auxhook.pdfbin114769 -> 107125 bytes
-rw-r--r--macros/latex/contrib/oberdiek/bigintcalc.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/bigintcalc.pdfbin351208 -> 342725 bytes
-rw-r--r--macros/latex/contrib/oberdiek/bitset.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/bitset.pdfbin351764 -> 343843 bytes
-rw-r--r--macros/latex/contrib/oberdiek/bmpsize.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/bmpsize.pdfbin357514 -> 327858 bytes
-rw-r--r--macros/latex/contrib/oberdiek/bookmark.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/bookmark.pdfbin299439 -> 291294 bytes
-rw-r--r--macros/latex/contrib/oberdiek/catchfile.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/catchfile.pdfbin152384 -> 144464 bytes
-rw-r--r--macros/latex/contrib/oberdiek/centernot.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/centernot.pdfbin176160 -> 168421 bytes
-rw-r--r--macros/latex/contrib/oberdiek/chemarr.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/chemarr.pdfbin102642 -> 94824 bytes
-rw-r--r--macros/latex/contrib/oberdiek/classlist.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/classlist.pdfbin107108 -> 99155 bytes
-rw-r--r--macros/latex/contrib/oberdiek/colonequals.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/colonequals.pdfbin112582 -> 104917 bytes
-rw-r--r--macros/latex/contrib/oberdiek/dvipscol.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/dvipscol.pdfbin99025 -> 90869 bytes
-rw-r--r--macros/latex/contrib/oberdiek/embedfile.dtx10
-rw-r--r--macros/latex/contrib/oberdiek/embedfile.pdfbin222803 -> 215085 bytes
-rw-r--r--macros/latex/contrib/oberdiek/engord.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/engord.pdfbin141815 -> 134331 bytes
-rw-r--r--macros/latex/contrib/oberdiek/enparen.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/enparen.pdfbin133925 -> 125599 bytes
-rw-r--r--macros/latex/contrib/oberdiek/eolgrab.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/eolgrab.pdfbin144686 -> 136589 bytes
-rw-r--r--macros/latex/contrib/oberdiek/epstopdf.pdfbin189232 -> 0 bytes
-rw-r--r--macros/latex/contrib/oberdiek/etexcmds.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/etexcmds.pdfbin138132 -> 130586 bytes
-rw-r--r--macros/latex/contrib/oberdiek/fibnum.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/fibnum.pdfbin157945 -> 150055 bytes
-rw-r--r--macros/latex/contrib/oberdiek/flags.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/flags.pdfbin112156 -> 104391 bytes
-rw-r--r--macros/latex/contrib/oberdiek/gettitlestring.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/gettitlestring.pdfbin150722 -> 142935 bytes
-rw-r--r--macros/latex/contrib/oberdiek/grfext.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/grfext.pdfbin156996 -> 149210 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hologo.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hologo.pdfbin403350 -> 393723 bytes
-rw-r--r--macros/latex/contrib/oberdiek/holtxdoc.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/holtxdoc.pdfbin134008 -> 126245 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hopatch.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hopatch.pdfbin134663 -> 126726 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hycolor.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hycolor.pdfbin233432 -> 225842 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hypbmsec.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hypbmsec.pdfbin122186 -> 114241 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hypcap.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hypcap.pdfbin119579 -> 111664 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hypdestopt.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hypdestopt.pdfbin139813 -> 131914 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hypdoc.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hypdoc.pdfbin165867 -> 157732 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hypgotoe.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hypgotoe.pdfbin117331 -> 109506 bytes
-rw-r--r--macros/latex/contrib/oberdiek/hyphsubst.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/hyphsubst.pdfbin135952 -> 127698 bytes
-rw-r--r--macros/latex/contrib/oberdiek/ifdraft.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/ifdraft.pdfbin101300 -> 93125 bytes
-rw-r--r--macros/latex/contrib/oberdiek/iflang.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/iflang.pdfbin164990 -> 157246 bytes
-rw-r--r--macros/latex/contrib/oberdiek/infwarerr.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/infwarerr.pdfbin156081 -> 148627 bytes
-rw-r--r--macros/latex/contrib/oberdiek/inputenx.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/inputenx.pdfbin778189 -> 770095 bytes
-rw-r--r--macros/latex/contrib/oberdiek/intcalc.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/intcalc.pdfbin327184 -> 317624 bytes
-rw-r--r--macros/latex/contrib/oberdiek/kvdefinekeys.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/kvdefinekeys.pdfbin125348 -> 117570 bytes
-rw-r--r--macros/latex/contrib/oberdiek/kvoptions.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/kvoptions.pdfbin323706 -> 315291 bytes
-rw-r--r--macros/latex/contrib/oberdiek/kvsetkeys.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/kvsetkeys.pdfbin227083 -> 219179 bytes
-rw-r--r--macros/latex/contrib/oberdiek/letltxmacro.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/letltxmacro.pdfbin163367 -> 154365 bytes
-rw-r--r--macros/latex/contrib/oberdiek/listingsutf8.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/listingsutf8.pdfbin138851 -> 130669 bytes
-rw-r--r--macros/latex/contrib/oberdiek/ltxcmds.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/ltxcmds.pdfbin296082 -> 295118 bytes
-rw-r--r--macros/latex/contrib/oberdiek/luacolor.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/luacolor.pdfbin149282 -> 141569 bytes
-rw-r--r--macros/latex/contrib/oberdiek/magicnum.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/magicnum.pdfbin159190 -> 151546 bytes
-rw-r--r--macros/latex/contrib/oberdiek/mleftright.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/mleftright.pdfbin137792 -> 129792 bytes
-rw-r--r--macros/latex/contrib/oberdiek/oberdiek.pdfbin418302 -> 398916 bytes
-rw-r--r--macros/latex/contrib/oberdiek/oberdiek.tex52
-rw-r--r--macros/latex/contrib/oberdiek/pagegrid.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pagegrid.pdfbin151437 -> 143837 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pagesel.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pagesel.pdfbin133558 -> 125704 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfcol.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdfcol.pdfbin154266 -> 146435 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolfoot.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolfoot.pdfbin122442 -> 114523 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolmk.dtx1011
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolmk.pdfbin151509 -> 0 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolparallel.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolparallel.pdfbin157764 -> 150094 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdfcolparcolumns.pdfbin144691 -> 136921 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfcrypt.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdfcrypt.pdfbin156221 -> 147277 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfescape.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdfescape.pdfbin246821 -> 239513 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdflscape.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdflscape.pdfbin142156 -> 134501 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdfrender.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pdfrender.pdfbin209981 -> 202389 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pdftexcmds.pdfbin240026 -> 0 bytes
-rw-r--r--macros/latex/contrib/oberdiek/picture.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/picture.pdfbin124352 -> 116677 bytes
-rw-r--r--macros/latex/contrib/oberdiek/pmboxdraw.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/pmboxdraw.pdfbin503296 -> 495154 bytes
-rw-r--r--macros/latex/contrib/oberdiek/protecteddef.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/protecteddef.pdfbin146856 -> 138810 bytes
-rw-r--r--macros/latex/contrib/oberdiek/refcount.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/refcount.pdfbin186104 -> 177858 bytes
-rw-r--r--macros/latex/contrib/oberdiek/rerunfilecheck.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/rerunfilecheck.pdfbin150017 -> 142409 bytes
-rw-r--r--macros/latex/contrib/oberdiek/resizegather.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/resizegather.pdfbin143159 -> 135638 bytes
-rw-r--r--macros/latex/contrib/oberdiek/rotchiffre.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/rotchiffre.pdfbin170058 -> 162136 bytes
-rw-r--r--macros/latex/contrib/oberdiek/scrindex.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/scrindex.pdfbin120323 -> 112554 bytes
-rw-r--r--macros/latex/contrib/oberdiek/selinput.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/selinput.pdfbin152421 -> 144530 bytes
-rw-r--r--macros/latex/contrib/oberdiek/setouterhbox.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/setouterhbox.pdfbin160804 -> 153089 bytes
-rw-r--r--macros/latex/contrib/oberdiek/settobox.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/settobox.pdfbin129245 -> 121340 bytes
-rw-r--r--macros/latex/contrib/oberdiek/soulutf8.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/soulutf8.pdfbin236665 -> 228977 bytes
-rw-r--r--macros/latex/contrib/oberdiek/stackrel.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/stackrel.pdfbin109432 -> 101756 bytes
-rw-r--r--macros/latex/contrib/oberdiek/stampinclude.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/stampinclude.pdfbin112509 -> 104658 bytes
-rw-r--r--macros/latex/contrib/oberdiek/stringenc.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/stringenc.pdfbin568512 -> 560339 bytes
-rw-r--r--macros/latex/contrib/oberdiek/tabularht.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/tabularht.pdfbin156363 -> 148501 bytes
-rw-r--r--macros/latex/contrib/oberdiek/tabularkv.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/tabularkv.pdfbin98095 -> 90420 bytes
-rw-r--r--macros/latex/contrib/oberdiek/telprint.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/telprint.pdfbin141274 -> 133279 bytes
-rw-r--r--macros/latex/contrib/oberdiek/thepdfnumber.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/thepdfnumber.pdfbin177672 -> 169779 bytes
-rw-r--r--macros/latex/contrib/oberdiek/transparent.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/transparent.pdfbin109328 -> 101561 bytes
-rw-r--r--macros/latex/contrib/oberdiek/twoopt.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/twoopt.pdfbin108604 -> 100555 bytes
-rw-r--r--macros/latex/contrib/oberdiek/uniquecounter.dtx8
-rw-r--r--macros/latex/contrib/oberdiek/uniquecounter.pdfbin142362 -> 134249 bytes
-rw-r--r--macros/latex/contrib/oberdiek/zref.dtx10
-rw-r--r--macros/latex/contrib/oberdiek/zref.pdfbin521043 -> 513339 bytes
-rw-r--r--macros/latex/contrib/pdfcolmk/README.md14
-rw-r--r--macros/latex/contrib/pdfcolmk/pdfcolmk.sty24
-rw-r--r--macros/latex/contrib/pdftexcmds/README.md11
-rw-r--r--macros/latex/contrib/pdftexcmds/pdftexcmds.dtx (renamed from macros/latex/contrib/oberdiek/pdftexcmds.dtx)147
-rw-r--r--macros/latex/contrib/pdftexcmds/pdftexcmds.pdfbin0 -> 411206 bytes
204 files changed, 888 insertions, 3177 deletions
diff --git a/macros/latex/contrib/attachfile2/README.md b/macros/latex/contrib/attachfile2/README.md
new file mode 100644
index 0000000000..d014b5549a
--- /dev/null
+++ b/macros/latex/contrib/attachfile2/README.md
@@ -0,0 +1,11 @@
+# attachfile2
+attach files to PDF documents
+
+
+
+See the embedfile package for a newer package supporting this feature.
+
+
+This package comes with a Perl script pdfatfi.pl
+that should be installed somewhere in PATH as `pdfatfi', see also
+package documentation.
diff --git a/macros/latex/contrib/oberdiek/attachfile2.dtx b/macros/latex/contrib/attachfile2/attachfile2.dtx
index 6a0dfdc5de..0b5922b976 100644
--- a/macros/latex/contrib/oberdiek/attachfile2.dtx
+++ b/macros/latex/contrib/attachfile2/attachfile2.dtx
@@ -1,13 +1,13 @@
% \iffalse meta-comment
%
% File: attachfile2.dtx
-% Version: 2019/07/24 v2.9
+% Version: 2019/11/24 v2.10
% Info: Attach files into PDF
%
-% Copyright (C) 2005-2010, 2012 by
-% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-% 2019
-% https://github.com/ho-tex/oberdiek/issues
+% Copyright (C)
+% 2005-2010, 2012 Heiko Oberdiek
+% 2016-2019 Oberdiek Package Support Group
+% https://github.com/ho-tex/attachfile2/issues
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -23,17 +23,17 @@
%
% The Current Maintainers of this work are
% Heiko Oberdiek and the Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% https://github.com/ho-tex/attachfile2/issues
%
% This work consists of the main source file attachfile2.dtx
% and the derived files
% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv,
-% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def,atfi-luatex.def
+% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, atfi-luatex.def
% pdfatfi.pl.
%
% Distribution:
-% CTAN:macros/latex/contrib/oberdiek/attachfile2.dtx
-% CTAN:macros/latex/contrib/oberdiek/attachfile2.pdf
+% CTAN:macros/latex/contrib/attachfile2/attachfile2.dtx
+% CTAN:macros/latex/contrib/attachfile2/attachfile2.pdf
%
% Unpacking:
% (a) If attachfile2.ins is present:
@@ -62,14 +62,14 @@
% pdflatex attachfile2.dtx
%
% Installation:
-% TDS:tex/latex/oberdiek/attachfile2.sty
-% TDS:tex/latex/oberdiek/atfi-dvips.def
-% TDS:tex/latex/oberdiek/atfi-pdftex.def
-% TDS:tex/latex/oberdiek/atfi-dvipdfmx.def
-% TDS:tex/latex/oberdiek/atfi-luatex.def
-% TDS:scripts/oberdiek/pdfatfi.pl (exec flag)
-% TDS:doc/latex/oberdiek/attachfile2.pdf
-% TDS:source/latex/oberdiek/attachfile2.dtx
+% TDS:tex/latex/attachfile2/attachfile2.sty
+% TDS:tex/latex/attachfile2/atfi-dvips.def
+% TDS:tex/latex/attachfile2/atfi-pdftex.def
+% TDS:tex/latex/attachfile2/atfi-dvipdfmx.def
+% TDS:tex/latex/attachfile2/atfi-luatex.def
+% TDS:scripts/attachfile2/pdfatfi.pl (exec flag)
+% TDS:doc/latex/attachfile2/attachfile2.pdf
+% TDS:source/latex/attachfile2/attachfile2.dtx
%
%<*ignore>
\begingroup
@@ -86,7 +86,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: attachfile2 2019/07/24 v2.9 Attach files into PDF (HO)}
+\Msg{* Package: attachfile2 2019/11/24 v2.10 Attach files into PDF (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -98,10 +98,11 @@
This is a generated file.
Project: attachfile2
-Version: 2019/07/24 v2.9
+Version: 2019/11/24 v2.10
-Copyright (C) 2005-2010, 2012 by
- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+Copyright (C)
+ 2005-2010, 2012 Heiko Oberdiek
+ 2016-2019 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -117,13 +118,13 @@ This work has the LPPL maintenance status "maintained".
The Current Maintainers of this work are
Heiko Oberdiek and the Oberdiek Package Support Group
-https://github.com/ho-tex/oberdiek/issues
+https://github.com/ho-tex/attachfile2/issues
This work consists of the main source file attachfile2.dtx
and the derived files
attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv,
- atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def,
+ atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, atfi-luatex.def
pdfatfi.pl.
\endpreamble
@@ -132,7 +133,7 @@ and the derived files
\generate{%
\file{attachfile2.ins}{\from{attachfile2.dtx}{install}}%
\file{attachfile2.drv}{\from{attachfile2.dtx}{driver}}%
- \usedir{tex/latex/oberdiek}%
+ \usedir{tex/latex/attachfile2}%
\file{attachfile2.sty}{\from{attachfile2.dtx}{package}}%
\file{atfi-dvips.def}{\from{attachfile2.dtx}{dvips}}%
\file{atfi-pdftex.def}{\from{attachfile2.dtx}{pdftex}}%
@@ -140,10 +141,10 @@ and the derived files
\file{atfi-dvipdfmx.def}{\from{attachfile2.dtx}{dvipdfmx}}%
\nopreamble
\nopostamble
- \usedir{scripts/oberdiek}%
+ \usedir{scripts/attachfile2}%
\csname execfiletrue\endcsname
\file{pdfatfi.pl}{\from{attachfile2.dtx}{pdfatfi}}%
-% \usedir{source/latex/oberdiek/catalogue}%
+% \usedir{source/latex/attachfile2/catalogue}%
% \file{attachfile2.xml}{\from{attachfile2.dtx}{catalogue}}%
}
@@ -155,7 +156,7 @@ and the derived files
\Msg{* files into a directory searched by TeX:}
\Msg{*}
\Msg{* attachfile2.sty, atfi-dvips.def, atfi-pdftex.def,}
-\Msg{* atfi-dvipdfmx.def}
+\Msg{* atfi-dvipdfmx.def, atfi-luatex.def}
\Msg{*}
\Msg{* And install the following script file:}
\Msg{*}
@@ -176,7 +177,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{attachfile2.drv}%
- [2019/07/24 v2.9 Attach files into PDF (HO)]%
+ [2019/11/24 v2.10 Attach files into PDF (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\begin{document}
@@ -205,9 +206,9 @@ and the derived files
% \GetFileInfo{attachfile2.drv}
%
% \title{The \xpackage{attachfile2} package}
-% \date{2019/07/24 v2.9}
+% \date{2019/11/24 v2.10}
% \author{Heiko Oberdiek\thanks
-% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
+% {Please report any issues at \url{https://github.com/ho-tex/attachfile2/issues}}}
%
% \maketitle
%
@@ -433,15 +434,13 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{attachfile2}%
- [2019/07/24 v2.9 Attach files into PDF (HO)]%
+ [2019/11/24 v2.10 Attach files into PDF (HO)]%
% \end{macrocode}
%
% \subsubsection{Loading of packages}
%
% \begin{macrocode}
-\RequirePackage{ifpdf}[2009/04/10]
-\RequirePackage{ifxetex}
-\RequirePackage{ifluatex}[2009/04/10]
+\RequirePackage{iftex}[2019/11/07]
\RequirePackage{keyval}
\RequirePackage{color}
\RequirePackage{infwarerr}[2010/04/08]
@@ -1624,7 +1623,7 @@ and the derived files
%<*pdftex>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atfi-pdftex.def}%
- [2019/07/24 v2.9 attachfile2 driver for pdfTeX (HO)]%
+ [2019/11/24 v2.10 attachfile2 driver for pdfTeX (HO)]%
% \end{macrocode}
%
% \paragraph{Macros for graphics data}
@@ -1808,7 +1807,7 @@ and the derived files
%<*luatex>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atfi-luatex.def}%
- [2019/07/24 v2.9 attachfile2 driver for luaTeX (HO)]%
+ [2019/11/24 v2.10 attachfile2 driver for luaTeX (HO)]%
\protected\def\atfi@literal {\pdfextension literal}
\def\atfi@GSAVE{q }
\def\atfi@GRESTORE{Q }
@@ -1942,7 +1941,7 @@ and the derived files
%<*dvips>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atfi-dvips.def}%
- [2019/07/24 v2.9 attachfile2 driver for dvips (HO)]%
+ [2019/11/24 v2.10 attachfile2 driver for dvips (HO)]%
% \end{macrocode}
%
% \paragraph{Macros for graphics data}
@@ -2517,7 +2516,7 @@ and the derived files
%<*dvipdfmx>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{atfi-dvipdfmx.def}%
- [2019/07/24 v2.9 attachfile2 driver for dvipdfmx/XeTeX (HO)]%
+ [2019/11/24 v2.10 attachfile2 driver for dvipdfmx/XeTeX (HO)]%
% \end{macrocode}
%
% \paragraph{Macros for graphics data}
@@ -2776,9 +2775,8 @@ $^W=1; # turn warning on
# This work has the LPPL maintenance status "maintained".
#
# The Current Maintainers of this work are
-Heiko Oberdiek and the Oberdiek Package Support Group
-https://github.com/ho-tex/oberdiek/issues
-
+# Heiko Oberdiek and the Oberdiek Package Support Group
+# https://github.com/ho-tex/attachfile2/issues
#
# See file "attachfile2.pdf" for a list of files that belong to
# this project.
@@ -2790,7 +2788,7 @@ my $prj = 'pdfatfi';
my $file = "$prj.pl";
my $program = uc($&) if $file =~ /^\w+/;
my $version = "2.9";
-my $date = "2019/07/24";
+my $date = "2019/11/24";
my $author = "Heiko Oberdiek";
my $copyright = "Copyright (c) 2005-2010, 2012 by $author.";
#
@@ -2799,7 +2797,7 @@ my $copyright = "Copyright (c) 2005-2010, 2012 by $author.";
# 2006/08/16 v2.2: Included in DTX file of attachfile2.dtx.
# 2010/09/27 v2.6: Keys ModDateTZ and CreationDateTZ added.
# 2016/05/16 v2.8: Option --version added.
-# 2019/07/24 v2.9: adapted version to attachfile2 version.
+# 2019/11/24 v2.10: adapted version to attachfile2 version.
#
use POSIX qw(strftime); # %z is used (GNU)
@@ -2902,9 +2900,9 @@ while(<IN>) {
print "!!! Warning: File `$file' not found!\n";
}
else {
- my $size = @s[7];
- my $mtime = @s[9];
- my $ctime = @s[10]; # inode change time
+ my $size = $s[7];
+ my $mtime = $s[9];
+ my $ctime = $s[10]; # inode change time
my ($sec, $min, $hour, $mday, $mon, $year) =
localtime($mtime);
@@ -2988,17 +2986,17 @@ __END__
% \paragraph{Package.} This package is available on
% CTAN\footnote{\CTANpkg{attachfile2}}:
% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/attachfile2.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/attachfile2.pdf}] Documentation.
+% \item[\CTAN{macros/latex/contrib/attachfile2/attachfile2.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/attachfile2/attachfile2.pdf}] Documentation.
% \end{description}
%
%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% \paragraph{Bundle.} All the packages of the bundle `attachfile2'
% are also available in a TDS compliant ZIP archive. There
% the packages are already unpacked and the documentation files
% are generated. The files and directories obey the TDS standard.
% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/attachfile2.tds.zip}]
% \end{description}
% \emph{TDS} refers to the standard ``A Directory Structure
% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -3006,23 +3004,23 @@ __END__
%
% \subsection{Bundle installation}
%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
+% \paragraph{Unpacking.} Unpack the \xfile{attachfile2.tds.zip} in the
% TDS tree (also known as \xfile{texmf} tree) of your choice.
% Example (linux):
% \begin{quote}
-% |unzip oberdiek.tds.zip -d ~/texmf|
+% |unzip attachfile2.tds.zip -d ~/texmf|
% \end{quote}
%
% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% Check the directory \xfile{TDS:scripts/attachfile2/} for
% scripts that need further installation steps.
% Package \xpackage{attachfile2} comes with the Perl script
% \xfile{pdfatfi.pl} that should be installed in such a way
% that it can be called as \texttt{pdfatfi}.
% Example (linux):
% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% |chmod +x scripts/attachfile2/pdfatfi.pl|\\
+% |cp scripts/attachfile2/pdfatfi.pl /usr/local/bin/|
% \end{quote}
%
% \subsection{Package installation}
@@ -3040,13 +3038,13 @@ __END__
% \begin{quote}
% \def\t{^^A
% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-% attachfile2.sty & tex/latex/oberdiek/attachfile2.sty\\
-% atfi-dvips.def & tex/latex/oberdiek/atfi-dvips.def\\
-% atfi-pdftex.def & tex/latex/oberdiek/atfi-pdftex.def\\
-% atfi-dvipdfmx.def & tex/latex/oberdiek/atfi-dvipdfmx.def\\
-% pdfatfi.pl & scripts/oberdiek/pdfatfi.pl\\
-% attachfile2.pdf & doc/latex/oberdiek/attachfile2.pdf\\
-% attachfile2.dtx & source/latex/oberdiek/attachfile2.dtx\\
+% attachfile2.sty & tex/latex/attachfile2/attachfile2.sty\\
+% atfi-dvips.def & tex/latex/attachfile2/atfi-dvips.def\\
+% atfi-pdftex.def & tex/latex/attachfile2/atfi-pdftex.def\\
+% atfi-dvipdfmx.def & tex/latex/attachfile2/atfi-dvipdfmx.def\\
+% pdfatfi.pl & scripts/attachfile2/pdfatfi.pl\\
+% attachfile2.pdf & doc/latex/attachfile2/attachfile2.pdf\\
+% attachfile2.dtx & source/latex/attachfile2/attachfile2.dtx\\
% \end{tabular}^^A
% }^^A
% \sbox0{\t}^^A
@@ -3282,6 +3280,14 @@ __END__
% \item
% Added luatex driver (UF, issue 69)
% \end{Version}
+% \begin{Version}{2019/11/24 v2.10}
+% \item
+% Fix perl header comment
+% \item
+% Address perl warning \verb|Scalar value @s[7] better written as $s[7] at pdfatfi.pl line 147|
+% \item
+% use \CTANpkg{iftex} not \CTANpkg{ifpdf}, \CTANpkg{ifxetex}, \CTANpkg{ifluatex}.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/macros/latex/contrib/attachfile2/attachfile2.pdf b/macros/latex/contrib/attachfile2/attachfile2.pdf
new file mode 100644
index 0000000000..193c7e6793
--- /dev/null
+++ b/macros/latex/contrib/attachfile2/attachfile2.pdf
Binary files differ
diff --git a/macros/latex/contrib/caption/CHANGELOG b/macros/latex/contrib/caption/CHANGELOG
index 68fb6c4a8c..1eab8c90a4 100644
--- a/macros/latex/contrib/caption/CHANGELOG
+++ b/macros/latex/contrib/caption/CHANGELOG
@@ -112,6 +112,12 @@ v3.3 (2013/01/06)
- Corrects incorrect load order hyperref-float now (needs hyperref v6.82q or newer)
- New switch \ifsinglelinecaption for usage inside own commands added
+v3.4 (2019/09/11)
+- Label format `autodot' added (for usage within documents using KOMA-Script document class)
+- Label format `unnumbered' added
+- \ContinuedFloat renamed to \continuedfloat (since this is not a preamble command)
+- \caption will always be re-defined now, unless `compatibility' is set to `v1' (or an incompatible package is loaded)
+
bicaption package
-----------------
@@ -162,22 +168,12 @@ v1.1 (2011/08/17)
- New command \phantomsubcaption
v1.2 (2018/05/13)
-- Optional argument values `B' and `T' added to the environments `subfigure' and `subtable'
+- Values `B' and `T' for the optional argument <outer-pos> added to the environments `subfigure' and `subtable'
v1.3 (2019/08/31)
- New command \subfloat for easy transition from the `subfig' package
-newfloat package
-----------------
-
-v1.0 (2011/10/30)
-- 1st published version
-
-v1.1 (2013/04/27)
-- New command \PrepareListOf
-
-
totalcount package
------------------
diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README
index baf9a932e9..74919d6378 100644
--- a/macros/latex/contrib/caption/README
+++ b/macros/latex/contrib/caption/README
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2019-09-01
+Release 2019-11-24
Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
@@ -29,7 +29,7 @@ or send an e-mail to
--------------------------------------------------------------------------
-The `caption' package v3.3 offers customization of captions of floating
+The `caption' package v3.4 offers customization of captions of floating
environments such `figure' and `table' and cooperates with the packages
float, floatflt, fltpage, hyperref, hypcap, listings, longtable,
@@ -73,11 +73,8 @@ User Manual: subcaption.pdf (English)
--------------------------------------------------------------------------
-The `newfloat' package v1.1 offers the command \DeclareFloatingEnvironment
-for defining new floating environments which behave like the existing
-floating environments "figure" and "table".
-
-User Manual: newfloat.pdf (English)
+Note: The `newfloat' package was removed from this package bundle and was
+uploaded to CTAN as stand-alone package.
==========================================================================
(The pictures cat.eps & elephant.eps were taken with permission from the
diff --git a/macros/latex/contrib/caption/caption.dtx b/macros/latex/contrib/caption/caption.dtx
index 89abe25309..3b0a396831 100644
--- a/macros/latex/contrib/caption/caption.dtx
+++ b/macros/latex/contrib/caption/caption.dtx
@@ -25,12 +25,12 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3694}
+% \CheckSum{2974}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption.drv}[2011/08/06 v3.3 Implementation of the caption package]
+\ProvidesFile{caption.drv}[2015/09/16 v3.4 Implementation of the caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -89,8 +89,6 @@
%
% \newcommand*\issue[1]{GitLab~\##1}
%
-% \GetFileInfo{caption.drv}
-% \let\docdate\filedate
% \GetFileInfo{caption.sty}
%
% \title{The Implementation of
@@ -99,7 +97,7 @@
% {the caption package}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
-% \date{\docdate}
+% \date{\filedate}
% \maketitle
%
% \begin{abstract}
@@ -120,10 +118,10 @@
% \package{caption3} kernel.
% \end{abstract}
%
-% \section*{User manuals}
+% \section*{User manual}
%
-% This document is describing the code implementation only. The user
-% documentation can be found in
+% This document is describing the code implementation only.
+% The user documentation can be found in
% \nopagebreak\begin{quote}
% \begin{tabular}{ll}
% \href{http://mirror.ctan.org/macros/latex/contrib/caption/caption-eng.pdf}%
@@ -201,46 +199,41 @@
% \changes{v1.4}{1995/01/30}{New option \texttt{nooneline}}
% \changes{v1.4b}{1995/04/05}{Bugfix release}
% \changes{v3.0}{2003/12/20}{Rewritten; many new commands and features}
-% \changes{v3.0d}{2004/11/28}{Split into two packages:
-% \package{caption} \& \package{caption3}}
+% \changes{v3.0d}{2004/11/28}{Split into two packages: \package{caption} \& \package{caption3}}
%
% \iffalse
% --------------------------------------------------------------------------- %
% \fi
%
% \clearpage
-% \let\subsubsection\subsection
-% \let\subsection\section
%
% \iffalse
%<*package>
% \fi
%
-% \subsection{Identification}
+% \section{Identification}
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2019/09/01 v3.3d Customizing captions (AR)]
+\ProvidesPackage{caption}[2019/10/18 v3.4a Customizing captions (AR)]
% \end{macrocode}
%
-% \subsection{Loading the kernel}
+% \section{Loading the kernel}
%
% \begin{macrocode}
-\RequirePackage{caption3}[2019/09/01] % needs v1.8d or newer
+\RequirePackage{caption3}[2019/09/09] % needs v1.8e or newer
% \end{macrocode}
%
-% \subsection{Check against incompatible document classes}
+% \section{Check against unknown document classes}
%
% \begin{macrocode}
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
- Unsupported document class (or package) detected,\MessageBreak
- usage of the caption package is not recommended}%
- \caption@InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption}%
-}
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}}
% \end{macrocode}
%
-% \subsection{Check against incompatible packages}
+% \section{Check against incompatible packages}
%
% \changes{v3.0p}{2007/04/06}{Check against obsolete \package{caption2} package added}
% \begin{macrocode}
@@ -265,7 +258,7 @@
% \changes{v3.1g}{2008/03/20}{\texttt{position=b} added}
% \changes{v3.1h}{2008/03/29}{%
% Name changed from \cs{caption@IncompatiblePackage} to \cs{caption@DisablePositionOption};
-% moved from package to kernel; disables the `position' option now instead of issuing a warning}
+% disables the `position' option now instead of issuing a warning}
% |\caption@DisablePositionOption|\marg{package}\par
% disables the `position' option.
% \begin{macrocode}
@@ -284,9 +277,9 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Declaration of options}
+% \section{Declaration of options}
%
-% \subsubsection{Options for figure and table}
+% \subsection{Options for figure and table}
%
% \changes{v3.0a}{2004/01/09}{Options \opt{figureposition} and \opt{tableposition} added}
% \begin{macrocode}
@@ -401,7 +394,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{Miscellaneous options}
+% \subsection{Miscellaneous options}
%
% \begin{macrocode}
\DeclareCaptionOption*{config}[caption]{%
@@ -471,15 +464,57 @@
\captionsetup{@minipage=default}
% \end{macrocode}
%
-% \subsubsection{caption v1.x compatibility options}
+% \subsection{caption v1.x compatibility options}
% \changes{v3.1}{2007/07/21}{Option `compatibility' added}
% \changes{v3.1}{2007/09/01}{caption v1.x compatibility options revised}
% \changes{v3.1d}{2007/10/24}{Bugfix 07-10-24 in caption v1.x$ compatibility options}
%
+% Currently we support |v1| and |v3| as values for the |compatibility=| option.
+% But since this used to be a boolean option is the past we still support any boolean value
+% for compatibility reasons.
+%
% \begin{macrocode}
-\DeclareCaptionOption{compatibility}[1]{\caption@setbool{compatibility}{#1}}
+\DeclareCaptionOption{compatibility}[v1]{%
+ \caption@ifinlist{#1}{v1,1,true,yes,on}{%
+ \let\caption@ifcompatibility\@firstoftwo
+ }{\caption@ifinlist{#1}{v3,3,0,false,no,off}{%
+ \let\caption@ifcompatibility\@secondoftwo
+ }{%
+ \caption@Error{Undefined compatibility value `#1'}%
+ }}}
\@onlypreamble@key{caption}{compatibility}
% \end{macrocode}
+% \begin{macrocode}
+\caption@setbool{compatibility}{0} % default: Try not to be compatible to v1.x
+% \end{macrocode}
+%
+% \begin{macro}{\caption@setincompatible}
+% \changes{v3.4}{2019/09/09}{This macro added}
+% |\caption@setincompatible|\marg{condition}\marg{message text}
+% \begin{macrocode}
+\newcommand*\caption@setincompatible[2]{%
+ #1{%
+ \caption@WarningNoLine{%
+ #2;\MessageBreak
+ Setting compatibility to v1}%
+ \caption@setbool{compatibility}{1}%
+ }{}}
+% \end{macrocode}
+% \end{macro}
+%
+% Check against incompatible packages which used to work fine with v1 of the `caption' package.
+% \begin{macrocode}
+\caption@AtBeginDocument{\caption@ifcompatibility{}{%
+% \end{macrocode}
+% The usage of the (now obsolete) \package{captcont} package,
+% which brings its own definition of |\caption*|, was quite common in the old days.
+% \begin{macrocode}
+ \caption@setincompatible{\@ifpackageloaded{captcont}}{captcont package is loaded}%
+% \end{macrocode}
+% To be continued\ldots
+% \begin{macrocode}
+}}
+% \end{macrocode}
%
% \begin{macrocode}
\DeclareCaptionOptionNoValue*{normal}{%
@@ -529,7 +564,7 @@
\DeclareCaptionOptionNoValue*{ruled}{\caption@setbool{ruled}{1}}
% \end{macrocode}
%
-% \subsubsection{caption2 v2.x compatibility options}
+% \subsection{caption2 v2.x compatibility options}
% \changes{v3.0h}{2005/07/08}{caption2 \version{2.x} compatibility options added}
% \changes{v3.1}{2007/09/01}{caption2 v2.x compatibility options revised}
% \changes{v3.1d}{2007/10/24}{Bugfix 07-10-24 in caption v2.x$ compatibility options}
@@ -550,7 +585,7 @@
\caption@WarningNoLine{Obsolete option `ignoreLTcapwidth' ignored}}
% \end{macrocode}
%
-% \subsubsection{Obsolete caption v3.0 options}
+% \subsection{Obsolete caption v3.0 options}
% \changes{v3.1}{2007/05/07}{Package option \opt{caption} marked as obsolete,
% gives error now}
%
@@ -564,7 +599,7 @@
and do *not* load the caption package anymore}}}
% \end{macrocode}
%
-% \subsubsection{fltpage package support options}
+% \subsection{fltpage package support options}
%
% \changes{v3.1}{2007/09/01}{Options `FPlist' \& `FPref' added}
% With these options is controlled where the list-of entry and |\ref| resp.
@@ -587,7 +622,7 @@
\captionsetup{FPlist=caption,FPref=figure}
% \end{macrocode}
%
-% \subsubsection{hyperref package support options}
+% \subsection{hyperref package support options}
%
% \changes{v3.1}{2007/06/21}{Options `hypcap' \& `hypcapspace' added}
% With |hypcap=off| one can turn the \package{hypcap} support off
@@ -600,21 +635,21 @@
\captionsetup{hypcap=1,hypcapspace=.5\baselineskip}
% \end{macrocode}
%
-% \subsection{\AmS{} \& \SmF{} document classes support}
+% \section{\AmS{} \& \SmF{} document classes support}
% \changes{v3.1}{2007/07/29}{\AmS\ \& \SmF\ document classes support added}
%
% \begin{macrocode}
-\caption@ifamsclass{%
+\caption@ifclassloaded{ams}{%
\caption@InfoNoLine{AMS or SMF document class}%
% \end{macrocode}
% \begin{macrocode}
\setlength\belowcaptionskip{0pt}% set to 12pt by AMS class
% \end{macrocode}
% \begin{macrocode}
-}
+}{}
% \end{macrocode}
%
-% \subsection{\KOMAScript{} document classes support}
+% \section{\KOMAScript{} document classes support}
% \changes{v3.0a}{2004/01/18}{Minimum adaptation to \KOMAScript\ added}
% \changes{v3.0h}{2005/08/22}{\KOMAScript\ compatibility options added}
% \changes{v3.0i}{2005/11/17}{\KOMAScript\ compatibility commands added}
@@ -623,7 +658,7 @@
% \changes{v3.1}{2007/04/05}{\KOMAScript\ compatibility revised \& enhanced}
%
% \begin{macrocode}
-\caption@ifkomaclass{%
+\caption@ifclassloaded{koma}{%
\caption@InfoNoLine{KOMA-Script document class}%
% \end{macrocode}
%
@@ -651,7 +686,7 @@
% \begin{macro}{\@figurecaptionabovefalse}
% \changes{v3.3}{2013/02/15}{Support of \cs{@figurecaptionabovetrue} added}
% \begin{macrocode}
- \caption@ifundefined\@figurecaptionabovetrue{}{%
+ \caption@ifdefined\@figurecaptionabovetrue{%
% \end{macrocode}
% \begin{macrocode}
\g@addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}}
@@ -665,7 +700,7 @@
\fi
% \end{macrocode}
% \begin{macrocode}
- }%
+ }{}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -696,6 +731,7 @@
% instead of \cs{captionabove/below}}
% \changes{v3.1g}{2008/03/01}{\cs{def} changed to \cs{g@addto@macro}}
% \changes{v3.1k}{2009/10/09}{\opt{figureposition} and \opt{tableposition} will issue a warning now}
+% \changes{v3.4}{2019/09/11}{\opt{figureposition} and \opt{tableposition} will now set the position anyway since it could be used by other packages}
% Please note that these are stronger than the \opt{position} setting, therefore we
% override the options \opt{figureposition} and \opt{tableposition} to typeout a warning.
% \begin{macrocode}
@@ -705,10 +741,12 @@
% \begin{macrocode}
\DeclareCaptionOption{figureposition}{%
\caption@WarningNoLine{Option `figureposition=#1' has no effect\MessageBreak
- when used with a KOMA script document class}}
+ when used with a KOMA script document class}%
+ \captionsetup*[figure]{position=#1}}
\DeclareCaptionOption{tableposition}{%
\caption@WarningNoLine{Option `tableposition=#1' has no effect\MessageBreak
- when used with a KOMA script document class}}
+ when used with a KOMA script document class}%
+ \captionsetup*[table]{position=#1}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -731,7 +769,7 @@
% \end{macro}
%
% \begin{macrocode}
- \caption@ifundefined\cap@indent{}{\caption@setcapindent}
+ \caption@ifdefined\cap@indent{\caption@setcapindent}{}
% \end{macrocode}
%
% \begin{macro}{\setcapwidth}
@@ -749,11 +787,11 @@
% \begin{macrocode}
\newcommand*\caption@setcapwidth[1]{%
\ifx\\#1\\\else
- \caption@ifundefined\cap@margin{}{%
+ \caption@ifdefined\cap@margin{%
\def\@tempa{captionbeside}%
\ifx\@tempa\@currenvir\else\caption@Warning{%
Ignoring optional argument [#1] of \string\setcapwidth\MessageBreak}%
- \fi}%
+ \fi}{}%
\fi
\captionsetup{width=\cap@width}}
% \end{macrocode}
@@ -805,10 +843,10 @@
% \end{macrocode}
%
% \begin{macrocode}
-}
+}{}
% \end{macrocode}
%
-% \subsection{Processing of options}
+% \section{Processing of options}
%
% \changes{v3.0m}{2007/03/04}{Verbose option added}
% \changes{v3.1}{2007/07/02}{Verbose option removed from package}
@@ -819,7 +857,7 @@
\caption@ProcessOptions*{caption}
% \end{macrocode}
%
-% \subsection{\cs{caption}, \cs{@caption}, and \cs{@makecaption}}
+% \section{\cs{caption}, \cs{@caption}, and \cs{@makecaption}}
%
% \begin{macro}{\caption@ifflag}
% \changes{v3.3}{2011/12/28}{This switch added}
@@ -834,7 +872,7 @@
% |\caption@if|\-|flag{4}| is set if there is already content which have
% incremented the counter (so the counter doesn't need to be incremented
% for the main caption, further sub-figures, and other stuff), and
-% |\caption@if|\-|flag{1}| is set if |\Continued|\-|Float| was given.
+% |\caption@if|\-|flag{1}| is set if |\continued|\-|float| was given.
%
% In the past three boolean switches were used to store the flags, but since some
% packages (like the \package{floatrow} and \package{tabu} package) try hard to keep
@@ -1031,512 +1069,31 @@
%
% \begin{macro}{\caption@redefine}
% \changes{v3.1k}{2009/03/30}{This macro added, it contains the patching code now}
-% We only redefine |\caption| and |\@caption| if the current definitions
-% are well known, so documents written in the old (\package{caption}
-% package \version{1.x}) days (where |\caption| \& |\@caption| were not
-% redefined by us) will still compile fine.
-% For example the usage of the (now obsolete) \package{captcont} package,
-% which brings its own definition of |\caption*|, was quite common these days.
+% Prior to \version{3.4} we only redefined |\caption| and |\@caption| if the current definitions
+% were well known, so documents written in the old (\package{caption} package \version{1.x}) days
+% (where |\caption| \& |\@caption| were not redefined by us) still compiled fine.
+% This used to make sense when introducing \version{3.0} in the year 2003
+% but is simply overcautious and especially unwanted by the user nowadays.
+% So starting with \version{3.4} we only do not redefine |\caption| and |\@caption| if the
+% `compatibility' option is set to `v1'.
% \begin{macrocode}
\newcommand*\caption@redefine{}
\g@addto@macro\caption@redefine{%
% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@setbool{incompatible}{0}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\caption{%
- % ltfloat.dtx [2002/10/01 v1.1v LaTeX Kernel (Floats)]
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \expandafter\@firstofone
- \fi
- {\@dblarg{\@caption\@captype}}%
- }}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\caption{%
- % beamerbaselocalstructure.sty,v 1.53 2007/01/28 20:48:21 tantau
- \def\caption{
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside figure or table}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \expandafter\@firstofone
- \fi
- {\@dblarg{\@caption\@captype}}%
- }}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\caption{%
- % beamerbaselocalstructure.sty, Joseph Wright committed 4ac715c 2013-09-04
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside figure or table}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \expandafter\@firstofone
- \fi
- {\@dblarg{\@caption\@captype}}%
- }}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\caption{%
- % float.sty [2001/11/08 v1.3d Float enhancements (AL)]
- \long\def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \refstepcounter\@captype
- \let\@tempf\@caption
- \expandafter\ifx\csname @float@c@\@captype\endcsname\relax\else
- \expandafter\expandafter\let
- \expandafter\@tempf\csname @float@c@\@captype\endcsname
- \fi
- \fi
- \@dblarg{\@tempf\@captype}}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\caption{%
- % hyperref.sty [2007/02/27 v6.75t Hypertext links for LaTeX]
- % hyperref.sty [2007/04/09 v6.76a Hypertext links for LaTeX]
- % hyperref.sty [2007/06/12 v6.76h Hypertext links for LaTeX]
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \H@refstepcounter\@captype
- \@ifundefined{fst@\@captype}{%
- \let\Hy@tempa\@caption
- }{%
- \let\Hy@tempa\Hy@float@caption
- }%
- \expandafter\@firstofone
- \fi
- {\@dblarg{\Hy@tempa\@captype}}%
- }}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\caption{%
- % hyperref.sty [2007/08/05 v6.76j Hypertext links for LaTeX]
- \def\caption{%
- \ifx\@captype\@undefined
- \@latex@error{\noexpand\caption outside float}\@ehd
- \expandafter\@gobble
- \else
- \H@refstepcounter\@captype
- \let\Hy@tempa\@caption
- \@ifundefined{float@caption}{%
- }{%
- \expandafter\ifx\csname @float@c@\@captype\endcsname\float@caption
- \let\Hy@tempa\Hy@float@caption
- \fi
- }%
- \expandafter\@firstofone
- \fi
- {\@dblarg{\Hy@tempa\@captype}}%
- }}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\caption{%
- % memhfixc.sty [2010/08/17 v1.15 nameref/hyperref package fixes for memoir class]
- % \let\m@moldhypcaption\caption
- \long\def\caption{\donemaincaptiontrue\m@moldhypcaption}}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@IfCheckCommand{}{%
- \caption@InfoNoLine{%
- Incompatible package detected (regarding \string\caption).\MessageBreak
- \string\caption\space=\space\meaning\caption}%
- \caption@setbool{incompatible}{1}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % ltfloat.dtx [2002/10/01 v1.1v LaTeX Kernel (Floats)]
- \long\def\@caption#1[#2]#3{%
- \par
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \endgroup}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % beamerbaselocalstructure.sty,v 1.53 2007/01/28 20:48:21 tantau
- \long\def\@caption#1[#2]#3{% second argument ignored
- \par\nobreak
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \beamer@makecaption{#1}{\ignorespaces #3}\par\nobreak
- \endgroup}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % memhfixc.sty [2010/08/17 v1.15 nameref/hyperref package fixes for memoir class]
- \long\def\@caption#1[#2]#3{%
- \MNR@old@caption{#1}[{#2}]{#3}%
- \def\@currentlabelname{#2}%
- \M@gettitle{#2}%
- }}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
- \long\def\@caption#1[#2]#3{%
- \par
- \addtocontents{\csname ext@#1\endcsname}{\xstring\select@language{\main@Arabi@language}}%
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname}{\ignorespaces \if@rl{\textRL{#2}}\else\textLR{#2}\fi}}%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces \if@rl{\textRL{#3}}\else\textLR{#3}\fi}\par
- \endgroup}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
- \long\def\@caption#1[#2]#3{%
- \par
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname}%
- {\ignorespaces #2}}%
- \def\@fignm{figure}
- \ifx#1\@fignm\addcontentsline{fol}{#1}%
- {\protect\numberline{\csname the#1\endcsname}%
- {\ignorespaces #2}}\fi%
- \def\@tblnm{table}
- \ifx#1\@tblnm\addcontentsline{tol}{#1}%
- {\protect\numberline{\csname the#1\endcsname}%
- {\ignorespaces #2}}\fi%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \endgroup}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % magyar.ldf [2005/03/30 v1.4j Magyar support from the babel system]
- \long\def\@caption#1[#2]#3{%
- \csname par\endcsname
- \addcontentsline{\csname ext@#1\endcsname}{#1}%
- {\protect\numberline{\csname the#1\endcsname.}{\ignorespaces #2}}%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}%
- {\ignorespaces #3}\csname par\endcsname
- \endgroup}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
-% \caption@CheckCommand\float@caption{%
-% % float.sty [2001/11/08 v1.3d Float enhancements (AL)]
-% \long\def\float@caption#1[#2]#3{%
-% \addcontentsline{\@nameuse{ext@#1}}{#1}%
-% {\protect\numberline{\@nameuse{the#1}}{\ignorespaces #2}}
-% \global\setbox\@floatcapt\vbox\bgroup\@parboxrestore
-% \normalsize\@fs@capt{\@nameuse{fnum@#1}}{\ignorespaces #3}%
-% \@ifnextchar[{\float@ccon}{\egroup}}%
-% \long\def\float@ccon[#1]{#1\par\egroup}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2007/02/27 v6.75t Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \hyper@makecurrent{\@captype}%
- \def\@currentlabelname{#2}%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \hyper@@anchor{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3%
- \fi
- }%
- \par
- \endgroup
- }}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2007/04/09 v6.76a Hypertext links for LaTeX]
- % hyperref.sty [2007/06/12 v6.76h Hypertext links for LaTeX]
- % hyperref.sty [2007/08/05 v6.76j Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\let\@currentHref\hc@currentHref
- \else
- \hyper@makecurrent{\@captype}%
- \fi
- \def\@currentlabelname{#2}%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\@capstartfalse
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
- \else
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \hyper@@anchor{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3%
- \fi
- }%
- \fi
- \par
- \endgroup
- }}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2009/11/27 v6.79k Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\let\@currentHref\hc@currentHref
- \else
- \hyper@makecurrent{\@captype}%
- \fi
- \def\@currentlabelname{#2}%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\@capstartfalse
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
- \else
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{%
- \expandafter\hyper@@anchor\expandafter{\@currentHref}{\relax}%
- }%
- #3%
- \fi
- }%
- \fi
- \par
- \endgroup
- }}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % hyperref.sty [2009/12/09 v6.79m Hypertext links for LaTeX]
- % hyperref.sty [2009/12/28 v6.79z Hypertext links for LaTeX]
- \long\def\@caption#1[#2]#3{%
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\let\@currentHref\hc@currentHref
- \else
- \hyper@makecurrent{\@captype}%
- \fi
- \@ifundefined{NR@gettitle}{%
- \def\@currentlabelname{#2}%
- }{%
- \NR@gettitle{#2}%
- }%
- \par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
- \protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
- }%
- \begingroup
- \@parboxrestore
- \if@minipage
- \@setminipage
- \fi
- \normalsize
- \expandafter\ifx\csname if@capstart\expandafter\endcsname
- \csname iftrue\endcsname
- \global\@capstartfalse
- \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
- \else
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{%
- \expandafter\hyper@@anchor\expandafter{%
- \@currentHref
- }{\relax}%
- }%
- #3%
- \fi
- }%
- \fi
- \par
- \endgroup
- }}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % nameref.sty [2006/12/27 v2.28 Cross-referencing by name of section]
- \long\def\@caption#1[#2]{%
- \def\@currentlabelname{#2}%
- \NR@@caption{#1}[{#2}]%
- }}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % nameref.sty [2009/11/27 v2.32 Cross-referencing by name of section]
- \long\def\@caption#1[#2]{%
- \NR@gettitle{#2}%
- \NR@@caption{#1}[{#2}]%
- }}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % subfigure.sty [2002/07/30 v2.1.4 subfigure package]
- \long\def\@caption#1[#2]#3{%
- \@ifundefined{if#1topcap}%
- {\subfig@oldcaption{#1}[{#2}]{#3}}%
- {\@nameuse{if#1topcap}%
- \@listsubcaptions{#1}%
- \subfig@oldcaption{#1}[{#2}]{#3}%
- \else
- \subfig@oldcaption{#1}[{#2}]{#3}%
- \@listsubcaptions{#1}%
- \fi}}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % subfig.sty [2005/06/28 ver: 1.3 subfig package]
- \def\@caption{\caption@}%
-% \long\def\caption@#1[#2]#3{%
-% \@ifundefined{caption@setfloattype}%
-% \caption@settype
-% \caption@setfloattype
-% \@captype
-% \sf@ifpositiontop{%
-% \@listsubcaptions{#1}%
-% \sf@old@caption{#1}[{#2}]{#3}%
-% }{%
-% \sf@old@caption{#1}[{#2}]{#3}%
-% \@listsubcaptions{#1}%
-% }}%
- }%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % chkfloat.sty [2012/08/19 v0.1 chkfloat: check for moved floats]
- \def\@caption#1[#2]#3{\chkfloat@caption{#1}[#2]{#3}%
- \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat@page}{\csname fnum@#1\endcsname: #2}}%
- }}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@caption{%
- % chkfloat.sty [20??/??/?? v0.? chkfloat: check for moved floats]
- \def\@caption#1[#2]#3{\chkfloat@caption{#1}[{#2}]{#3}%
- \chkfloat@addcontentsline{#1}{#2}%
- }}%
-% \end{macrocode}
-%
-% \begin{macrocode}
- \caption@IfCheckCommand{}{%
- \caption@InfoNoLine{%
- Incompatible package detected (regarding \string\@caption).\MessageBreak
- \string\@caption\space=\space\meaning\@caption}%
- \caption@setbool{incompatible}{1}}%
-% \end{macrocode}
-%
-% The option |compatibility=| will override the compatibility mode.
-% \begin{macrocode}
- \caption@ifundefined\caption@ifcompatibility
- {\let\caption@ifcompatibility\caption@ifincompatible
- \let\caption@tempa\caption@WarningNoLine}%
- {\let\caption@tempa\@gobble}% suppress warning
-% \end{macrocode}
-%
% \begin{macrocode}
\caption@ifcompatibility{%
% \end{macrocode}
-%
% \begin{macrocode}
- \caption@tempa{%
- \noexpand\caption will not be redefined since it's already\MessageBreak
- redefined by a document class or package which is\MessageBreak
- unknown to the caption package}%
+ \caption@InfoNoLine{
+ \noexpand\caption will not be redefined since `compatibility' is set to v1}%
% \end{macrocode}
-%
% \begin{macrocode}
\renewcommand*\caption@redefine{}%
% \end{macrocode}
%
-% |\ContinuedFloat| is not supported in compatibility mode.
+% |\continuedfloat| is not supported in compatibility mode.
% \begin{macrocode}
- \renewcommand*\caption@ContinuedFloatX[1]{%
+ \renewcommand*\caption@continuedfloat[1]{%
\caption@Error{Not available in compatibility mode}}%
% \end{macrocode}
%
@@ -1544,10 +1101,10 @@
% \begin{macrocode}
\caption@AtBeginDocument*{%
\let\caption@start\relax
- \caption@ifundefined\caption@ORI@capstart{}{%
+ \caption@ifdefined\caption@ORI@capstart{%
\caption@Debug{%
Restore hypcap definition of \string\capstart\@gobble}%
- \let\capstart\caption@ORI@capstart}%
+ \let\capstart\caption@ORI@capstart}{}%
}%
% \end{macrocode}
%
@@ -1562,22 +1119,12 @@
}{%
% \end{macrocode}
%
-% \begin{macrocode}
- \caption@ifincompatible{%
- \caption@WarningNoLine{%
- Forced redefinition of \noexpand\caption since the\MessageBreak
- unsupported(!) package option `compatibility=false'\MessageBreak
- was given}%
- }{}%
-% \end{macrocode}
-%
% \begin{macro}{\caption}
% \begin{macro}{\@caption}
% \begin{macrocode}
\renewcommand*\caption@redefine{%
\let\caption\caption@caption
\let\@caption\caption@@caption}%
- \caption@redefine
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1586,6 +1133,7 @@
}%
% \end{macrocode}
% \begin{macrocode}
+ \caption@redefine
\caption@AtBeginDocument*{%
\let\caption@ORI@capstart\@undefined}%
% \end{macrocode}
@@ -1635,7 +1183,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{\cs{captionof}}
+% \section{\cs{captionof}}
%
% \changes{v3.0d}{2004/08/03}{Option \opt{type=} added}
% \changes{v3.1}{2007/06/25}{Option \opt{type*=} added}
@@ -1777,8 +1325,7 @@
% Since we often need to check if |\@captype| is defined (means: we
% are inside a floating environment) this helper macro was introduced.
% \begin{macrocode}
-\newcommand*\caption@iftype{%
- \caption@ifundefined\@captype\@secondoftwo\@firstoftwo}
+\newcommand*\caption@iftype{\caption@ifdefined\@captype}
% \end{macrocode}
% \end{macro}
%
@@ -1879,7 +1426,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{\cs{captionlistentry}}
+% \section{\cs{captionlistentry}}
%
% \begin{macro}{\captionlistentry}
% \changes{v3.1}{2007/07/28}{This macro added}
@@ -1907,7 +1454,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{\cs{captionbox}}
+% \section{\cs{captionbox}}
%
% \begin{macro}{\captionbox}
% \changes{v3.2}{2010/12/17}{This macro added}
@@ -1975,9 +1522,9 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{\cs{ContinuedFloat}}
+% \section{\cs{continuedfloat}}
%
-% \begin{macro}{\ContinuedFloat}
+% \begin{macro}{\continuedfloat}
% \changes{v3.0i}{2005/11/12}{Optional argument added}
% \changes{v3.0g}{2005/06/28}{Bugfix: \cs{newcounter} replaced by \cs{newcount}}
% \changes{v3.1}{2007/07/02}{Format of \package{hyperref} extension changed}
@@ -1987,14 +1534,15 @@
% \changes{v3.3}{2011/12/28}{Uses \cs{ifcaption@ContinuedFloat} now}
% \changes{v3.3}{2013/05/01}{Usage of \cs{caption@restorecounters} added}
% \changes{v3.3}{2013/12/16}{Bugfix: Does not use \cs{caption@ContinuedFloat} anymore since this breaks \cs{ContinuedFloat} offered by the \package{subfig} package}
-% |\ContinuedFloat|\\
-% |\ContinuedFloat*|\par
+% \changes{v3.4}{2015/09/16}{Renamed from \cs{ContinuedFloat} to \cs{continuedfloat}}
+% |\continuedfloat|\\
+% |\continuedfloat*|\par
% This mainly sets the appropriate flag, increments the
% continuation counter, and executes the given options.
-% Furthermore we set |\caption@reset|\-|Continued|\-|Float| to |\@gobble| so the
+% Furthermore we set |\caption@reset|\-|continued|\-|float| to |\@gobble| so the
% continuation counter will not be reset to zero inside |\caption@ref|\-|step|\-|counter|.\par
% When the \package{hyperref} package is used we have the problem
-% that the usage of |\Continued|\-|Float| will create duplicate
+% that the usage of |\continued|\-|float| will create duplicate
% hyper links -- |\@current|\-|Href| will be the same for the main float and
% the continued ones. So we have to make sure unique labels and references
% will be created each time. We do this by extending |\the|\-|H|\-|figure| and
@@ -2006,57 +1554,80 @@
% \Note{This does not help if the \package{hyperref} package option
% \texttt{naturalnames=true} is set.}
% \begin{macrocode}
-\def\ContinuedFloat{%
+\def\continuedfloat{%
\caption@iftype
- {\caption@ContinuedFloatX\@captype}%
- {\caption@Error{\noexpand\ContinuedFloat outside float}}}
+ {\caption@continuedfloat\@captype}%
+ {\caption@Error{\noexpand\continuedfloat outside float}}}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@ContinuedFloatX[1]{%
+\newcommand*\caption@continuedfloat[1]{%
\@ifstar
{\caption@@refstepcounter\@captype
- \caption@@ContinuedFloat{#1}}%
- {\caption@Continued@Float{#1}}}
+ \caption@@continuedfloat{#1}}%
+ {\caption@continued@float{#1}}}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@Continued@Float[1]{%
+\newcommand*\caption@continued@float[1]{%
\edef\caption@tempa{#1}%
\ifx\caption@tempa\caption@CFtype
\caption@restorecounters
- \caption@@ContinuedFloat{#1}%
+ \caption@@continuedfloat{#1}%
\else
\caption@Error{Continued `#1' after `\caption@CFtype'}%
\fi}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@@ContinuedFloat{%
- \caption@setflag1% ContinuedFloat
- \caption@@@ContinuedFloat}
-\newcommand*\caption@@@ContinuedFloat{%
- \stepcounter{ContinuedFloat}%
- \caption@@@@ContinuedFloat}
+\newcommand*\caption@@continuedfloat{%
+ \caption@setflag1% continued float
+ \caption@@@continuedfloat}
+\newcommand*\caption@@@continuedfloat{%
+ \stepcounter{continuedfloat}%
+ \caption@@@@continuedfloat}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*\caption@@@@ContinuedFloat[1]{%
- \caption@setoptions{ContinuedFloat}%
+\newcommand*\caption@@@@continuedfloat[1]{%
+ \caption@setoptions{ContinuedFloat}% for compatibility reasons
+ \caption@setoptions{continuedfloat}%
\caption@setoptions{continued#1}%
- \expandafter\l@addto@macro\csname the#1\endcsname\theContinuedFloat
+ \expandafter\l@addto@macro\csname the#1\endcsname\thecontinuedfloat
\@ifundefined{theH#1}{}{%
\expandafter\l@addto@macro\csname theH#1\endcsname{%
- \@alph\c@ContinuedFloat}}%
- \let\caption@@@@ContinuedFloat\@gobble}
+ \@alph\c@continuedfloat}}%
+ \let\caption@@@@continuedfloat\@gobble}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@CFtype{??}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\theContinuedFloat}
+% \begin{macro}{\thecontinuedfloat}
+% \changes{v3.4}{2015/09/16}{Renamed from \cs{theContinuedFloat} to \cs{thecontinuedfloat}}
% This one is preset to \cs{@empty}, so usually the continuation counter is not
% included in the caption label or references.
% \begin{macrocode}
-\newcounter{ContinuedFloat}
-\let\theContinuedFloat\@empty
+\newcounter{continuedfloat}
+\let\c@ContinuedFloat\c@continuedfloat % defined for compatibility reasons
+\def\thecontinuedfloat{\theContinuedFloat}
+\let\theContinuedFloat\@empty % defined for compatibility reasons
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@reset@continuedfloat}
+% \changes{v3.2f}{2011/12/17}{Redefinition of \cs{continuedfloat} added}
+% |\caption@reset@continuedfloat|\marg{type}\par
+% If a continuation counter is defined, we reset it.
+% (This one will be called inside |\@caption|.)
+% \begin{macrocode}
+\newcommand*\caption@reset@continuedfloat[1]{%
+ \xdef\caption@CFtype{#1}%
+ \@stpelt{continuedfloat}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ContinuedFloat}
+% For compatibility reasons we still support |\Continued|\-|Float|.
+% \begin{macrocode}
+\def\ContinuedFloat{\continuedfloat} % defined for compatibility reasons
% \end{macrocode}
% \end{macro}
%
@@ -2067,20 +1638,8 @@
% This one is used by \cs{ContinuedFloat} offered by the \package{subfig} package.
% \begin{macrocode}
\def\caption@ContinuedFloat{%
- \let\caption@resetContinuedFloat\@gobble
- \caption@@@ContinuedFloat}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\caption@resetContinuedFloat}
-% \changes{v3.2f}{2011/12/17}{Redefinition of \cs{ContinuedFloat} added}
-% |\caption@resetContinuedFloat|\marg{type}\par
-% If a continuation counter is defined, we reset it.
-% (This one will be called inside |\@caption|.)
-% \begin{macrocode}
-\newcommand*\caption@resetContinuedFloat[1]{%
- \xdef\caption@CFtype{#1}%
- \@stpelt{ContinuedFloat}}
+ \let\caption@reset@continuedfloat\@gobble
+ \caption@@@continuedfloat}
% \end{macrocode}
% \end{macro}
%
@@ -2089,14 +1648,14 @@
% counter at |\@float|, right after |\done|\-|main|\-|caption|\-|false|,
% we save all sub-caption counters at |\done|\-|main|\-|caption|\-|false|
% so we can restore them using |\caption@restore|\-|counters|
-% inside |\Continued|\-|Float|.
+% inside |\continued|\-|float|.
% \begin{macrocode}
-\caption@ifundefined\donemaincaptionfalse{}{%
- \g@addto@macro\donemaincaptionfalse\caption@savesubcounters}
+\caption@ifdefined\donemaincaptionfalse{%
+ \g@addto@macro\donemaincaptionfalse\caption@savesubcounters}{}
% \end{macrocode}
% \end{macro}
%
-% \subsection{Internal helpers}
+% \section{Internal helpers}
%
% \begin{macro}{\caption@refstepcounter}
% \changes{v3.1}{2007/07/28}{This macro added}
@@ -2129,9 +1688,9 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@ref@stepcounter{%
- \caption@ifflag1{% ContinuedFloat
+ \caption@ifflag1{% continued float
\let\caption@tempa\caption@@refcounter
- \caption@clrflag1% ContinuedFloat
+ \caption@clrflag1% continued float
}{%
\let\caption@tempa\caption@@refstepcounter
\caption@ifflag2{}{% caption
@@ -2168,7 +1727,7 @@
% \begin{macrocode}
\newcommand*\caption@prepare@stepcounter[2]{%
\caption@addsubcontentslines{#2stepcounter}%
- \caption@resetContinuedFloat{#1}}
+ \caption@reset@continuedfloat{#1}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@@refstepcounter{\refstepcounter}
@@ -2207,8 +1766,7 @@
% \changes{v3.0a}{2004/01/23}{\cs{caption@settype} changed to \cs{caption@setfloattype}}
% \changes{v3.0e}{2005/04/12}{Check for default label format added}
% \changes{v3.0f}{2005/06/11}{Usage of \cs{caption@resetContinuedFloat} added}
-% \changes{v3.1}{2007/05/09}{Usage of \cs{caption@setfloattype} \&
-% \cs{caption@resetContinuedFloat} removed}
+% \changes{v3.1}{2007/05/09}{Usage of \cs{caption@setfloattype} \& \cs{caption@resetContinuedFloat} removed}
% \changes{v3.3}{2011/12/29}{Usage of \cs{caption@fixedposition} removed}
% Our handling of |\caption| will always be surrounded by
% |\caption@begin| (or |\caption@beginex|) and |\caption@end|.\par
@@ -2389,13 +1947,13 @@
% This one is needed for support of the \package{nameref} package.
% \begin{macrocode}
\newcommand\caption@gettitle[1]{%
- \caption@ifundefined\NR@gettitle
- {\def\@currentlabelname{#1}}%
- {\NR@gettitle{#1}}}
+ \caption@ifdefined\NR@gettitle
+ {\NR@gettitle{#1}}%
+ {\def\@currentlabelname{#1}}}
% \end{macrocode}
% \end{macro}
%
-% \subsection{Support for sub-captions}
+% \section{Support for sub-captions}
% \changes{v3.1f}{2007/11/16}{Support for sub-captions added}
%
% \begin{macro}{\caption@DeclareSubType}
@@ -2417,9 +1975,9 @@
% Initialize the sub-captions defined with \cs{newsubfloat}\cite{subfig}\ldots
% \begin{macrocode}
\caption@AtBeginDocument*{%
- \caption@ifundefined\sf@counterlist{}{%
+ \caption@ifdefined\sf@counterlist{%
\@for\sf@temp:=\sf@counterlist\do{%
- \expandafter\caption@DeclareSubType\sf@temp\@nil}}}
+ \expandafter\caption@DeclareSubType\sf@temp\@nil}}{}}
% \end{macrocode}
%
% \begin{macro}{\caption@subtypehook}
@@ -2449,7 +2007,7 @@
\let\caption@addsubcontentslines\@gobble
\caption@ifflag4{}{% subcaption
% no \subcaption in this part of the (floating) environment yet
- \caption@ifflag1{% ContinuedFloat
+ \caption@ifflag1{% continued float
\caption@clrflag1%
}{%
\caption@@stepcounter\@captype
@@ -2459,7 +2017,7 @@
}%
% \end{macrocode}
% \begin{macrocode}
- \c@ContinuedFloat=0\relax
+ \c@continuedfloat=0\relax
\let\caption@setfloatcapt\@firstofone
\let\caption@chkfloat\@gobbletwo
% \end{macrocode}
@@ -2474,7 +2032,7 @@
% redefine \setcaptiontype
\def\caption@settype{\caption@withoptargs\caption@sub@settype}%
\def\caption@sub@settype##1##2{%
- \def\caption@tempa{##2}%
+ \edef\caption@tempa{##2}%
\ifx\caption@tempa\@captype
%%% \caption@setsubtype##1\relax
\else
@@ -2608,36 +2166,41 @@
% We do this |\At|\-|Begin|\-|Document| so packages like \package{newfloat}
% will not complain about an unknown document class.
% \begin{macrocode}
-\AtBeginDocument{\caption@ifundefined\chapter{}{%
- \let\caption@chapter@ORI\chapter
- \def\chapter{%
- \caption@addsubcontentslines{chapter}\caption@chapter@ORI}}}
+\AtBeginDocument{%
+% \end{macrocode}
+% \begin{macrocode}
+ \caption@ifdefined\chapter{%
+ \let\caption@chapter@ORI\chapter
+ \def\chapter{%
+ \caption@addsubcontentslines{chapter}\caption@chapter@ORI}}{}%
% \end{macrocode}
% Same for \cs{appendix}.
% \begin{macrocode}
-\AtBeginDocument{\caption@ifundefined\appendix{}{%
- \let\caption@appendix@ORI\appendix
- \def\appendix{%
- \caption@addsubcontentslines{appendix}\caption@appendix@ORI}}}
+ \caption@ifdefined\appendix{%
+ \let\caption@appendix@ORI\appendix
+ \def\appendix{%
+ \caption@addsubcontentslines{appendix}\caption@appendix@ORI}}{}%
% \end{macrocode}
% Flush the list of pending sub-caption list entries at the end of the document.
% \begin{macrocode}
-\AtEndDocument{%
- \caption@addsubcontentslines{AtEndDocument}}
+ \caption@addsubcontentslines{AtEndDocument}%
+% \end{macrocode}
+% \begin{macrocode}
+}
% \end{macrocode}
% \end{macro}
%
%
-% \subsection{Document class \& Babel package support}
+% \section{Document class \& Babel package support}
%
-% \subsubsection{The \AmS{} \& \SmF{} classes}
+% \subsection{The \AmS{} \& \SmF{} classes}
% \changes{v3.1}{2007/07/29}{\AmS\ \& \SmF\ classes support added}
%
% \begin{macrocode}
-\caption@ifundefined\smf@makecaption{}{\let\smf@makecaption\@makecaption}
+\caption@ifdefined\smf@makecaption{\let\smf@makecaption\@makecaption}{}
% \end{macrocode}
%
-% \subsubsection{The beamer class}
+% \subsection{The beamer class}
% \changes{v3.1}{2007/03/10}{beamer class support added}
%
% \begin{macrocode}
@@ -2658,9 +2221,10 @@
% \begin{macro}{\table}
% \changes{v3.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
% \changes{v3.3d}{2019/09/01}{This re-definition for \class{beamer} document class revised}
+% \changes{v3.4a}{2019/10/18}{Bug fixed which was introduced in previous revision}
% We redefine |table| so our type-specific options will be used etc.
% \begin{macrocode}
- \let\caption@ORI@table\figure
+ \let\caption@ORI@table\table
\def\table{\caption@settype{table}\caption@ORI@table}
% \end{macrocode}
% \end{macro}
@@ -2669,18 +2233,18 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The \KOMAScript{} classes}
+% \subsection{The \KOMAScript{} classes}
%
% \KOMAScript\ contains the code
% |\AtBeginDocument{\let\scr@caption\caption}|
% so we need to update |\scr@caption| here, too.
%
% \begin{macrocode}
-\caption@ifundefined\scr@caption{}{%
- \caption@AtBeginDocument{\let\scr@caption\caption}}
+\caption@ifdefined\scr@caption{%
+ \caption@AtBeginDocument{\let\scr@caption\caption}}{}
% \end{macrocode}
%
-% \subsubsection{The frenchb Babel option}
+% \subsection{The frenchb Babel option}
% \changes{v3.1}{2006/05/14}{Adaptation to \package{frenchb} added}
%
% Suppress
@@ -2691,11 +2255,11 @@
\@nameuse{caption@frenchb}\@nameundef{caption@frenchb}
% \end{macrocode}
%
-% \subsubsection{The frenchle/pro package}
+% \subsection{The frenchle/pro package}
% \changes{v3.0h}{2005/10/03}{Adaptation to \package{frenchle/pro} added}
%
% \begin{macrocode}
-\caption@AtBeginDocument{\caption@ifundefined\frenchTeXmods{}{%
+\caption@AtBeginDocument{\caption@ifdefined\frenchTeXmods{%
\caption@InfoNoLine{frenchle/pro package is loaded}%
% \end{macrocode}
%
@@ -2709,9 +2273,9 @@
% captions have already been done, so we can do our patches immediately.
% Otherwise we must add our stuff to |\GOfrench|.
% \begin{macrocode}
- \caption@ifundefined\GOfrench
- {\let\caption@tempa\@firstofone}%
+ \caption@ifdefined\GOfrench
{\def\caption@tempa{\g@addto@macro\GOfrench}}%
+ {\let\caption@tempa\@firstofone}%
\caption@tempa{%
% \end{macrocode}
%
@@ -2768,10 +2332,10 @@
%
% \begin{macrocode}
}%
-}}
+}{}}
% \end{macrocode}
%
-% \subsubsection{The hungarian and magyar Babel option}
+% \subsection{The hungarian and magyar Babel option}
% \changes{v3.2}{2009/03/29}{\package{magyar} package support added}
% \changes{v3.3}{2018/08/26}{\package{magyar} package support revised}
%
@@ -2792,7 +2356,7 @@
\caption@tempa{magyar}%
% \end{macrocode}
%
-% \subsection{Package support}
+% \section{Package support}
% \changes{v3.1}{2007/04/11}{Package options `float', `longtable' etc.
% are not supported anymore, removed}
%
@@ -2881,10 +2445,10 @@
% Used by the \package{bicaption} package.
% \begin{macrocode}
\newcommand*\caption@freeze{%
- \let\caption@frozen@ContinuedFloat\ContinuedFloat
- \def\ContinuedFloat{%
- \caption@@freeze{\caption@@@@ContinuedFloat\@captype}%
- \caption@frozen@ContinuedFloat}%
+ \let\caption@frozen@continuedfloat\continuedfloat
+ \def\continuedfloat{%
+ \caption@@freeze{\caption@@@@continuedfloat\@captype}%
+ \caption@frozen@continuedfloat}%
% \end{macrocode}
% \begin{macrocode}
\let\caption@frozen@setup\caption@setup
@@ -2930,7 +2494,7 @@
% \end{macrocode}
% \begin{macrocode}
\def\caption@warmup{%
- \let\ContinuedFloat\caption@frozen@ContinuedFloat
+ \let\continuedfloat\caption@frozen@continuedfloat
\let\caption@setup\caption@frozen@setup
\let\caption\caption@frozen@caption
\let\label\caption@frozen@label}}%
@@ -2976,7 +2540,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{The chkfloat package}
+% \subsection{The chkfloat package}
% \changes{v3.3}{2018/09/06}{Support of the \package{chkfloat} package added}
%
% \begin{macrocode}
@@ -2986,12 +2550,13 @@
% \begin{macro}{\caption@chkfloat}
% \changes{v3.3}{2018/09/06}{This macro added}
% \begin{macrocode}
- \caption@ifundefined\chkfloat@addcontentsline{%
- \renewcommand\caption@chkfloat[2]{%
- \caption@ifundefined\chkfloat@page{}{%
- \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat@page}{\csname fnum@#1\endcsname: #2}}}}%
- }{%
+ \caption@ifdefined\chkfloat@addcontentsline{%
\renewcommand\caption@chkfloat{\chkfloat@addcontentsline}%
+ }{%
+ \renewcommand\caption@chkfloat[2]{%
+ \caption@ifdefined\chkfloat@page{%
+ \addtocontents{fof}{\protect\chkfloat@{\thepage}{\chkfloat@page}{\csname fnum@#1\endcsname: #2}}%
+ }{}}%
}%
% \end{macrocode}
% \end{macro}
@@ -3000,7 +2565,7 @@
}{}%
% \end{macrocode}
%
-% \subsubsection{The float package}
+% \subsection{The float package}
% \changes{v3.0f}{2005/05/31}{\package{float} package support rewritten and improved}
% \iffalse
% (This is a more straight-ahead implementation, but it only works with v1.3
@@ -3098,9 +2663,9 @@
% If it was redefined by the \package{hyperref} package,
% we need to build on the original definition (and not on the redefined one).
% \begin{macrocode}
- \caption@ifundefined\HyOrg@float@makebox
- {\let\caption@ORI@float@makebox\float@makebox}%
+ \caption@ifdefined\HyOrg@float@makebox
{\let\caption@ORI@float@makebox\HyOrg@float@makebox}%
+ {\let\caption@ORI@float@makebox\float@makebox}%
\renewcommand\float@makebox[1]{%
\caption@ORI@float@makebox{#1\relax \caption@defrostHref}}%
% \end{macrocode}
@@ -3230,7 +2795,7 @@
\caption@undefbool{ruled}
% \end{macrocode}
%
-% \subsubsection{The floatflt package}
+% \subsection{The floatflt package}
% \changes{v3.1}{2007/06/10}{Support of the \package{floatflt} package added}
%
% \begin{macrocode}
@@ -3282,7 +2847,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The fltpage package}
+% \subsection{The fltpage package}
% \changes{v3.1}{2007/07/22}{Support of the \package{fltpage} package added}
%
% \begin{macrocode}
@@ -3432,7 +2997,7 @@
}
% \end{macrocode}
%
-% \subsubsection{The hyperref package}
+% \subsection{The hyperref package}
% \changes{v3.0f}{2005/06/11}{Support of the \package{hyperref} package added}
% \changes{v3.1}{2007/03/09}{Usage of \cs{hyper@makecurrent} instead of
% \cs{theHfigure} as indicator for \package{hyperref} package}
@@ -3559,7 +3124,7 @@
% instead of \texttt{xxx} now}
% |\caption@makestart|\marg{type}
% defines a \package{hyperref} anchor inside |\caption@start|.\par
-% Since we offer |\ContinuedFloat| the float counter can change between
+% Since we offer |\continuedfloat| the float counter can change between
% `now' and |\caption|, i.e., we simply don't know the figure or table counter
% yet and therefore we are not able to generate the `right' \package{hyperref}
% label.
@@ -3706,7 +3271,7 @@
}}{}
% \end{macrocode}
%
-% \subsubsection{The hypcap package}
+% \subsection{The hypcap package}
% \changes{v3.0f}{2005/06/22}{Support of the \package{hypcap} package added}
% \changes{v3.0l}{2007/02/20}{Adapted to \package{hypcap} \version{1.6}}
% \changes{v3.1e}{2007/11/04}{\package{hypcap} support adapted to \package{hyperref} \version{6.77}}
@@ -3750,7 +3315,7 @@
\fi}{}
% \end{macrocode}
%
-% \subsubsection{The listings package}
+% \subsection{The listings package}
% \changes{v3.0b}{2004/05/16}{Support of the \package{listings} package added}
%
% \begin{macrocode}
@@ -3844,7 +3409,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The longtable package}
+% \subsection{The longtable package}
%
% \begin{macro}{\LTcaptype}
% \changes{v3.1}{2007/07/06}{This macro and its support added}
@@ -3903,7 +3468,7 @@
\@ifstar{\egroup\LT@listentry\LTcaptype}% gobble *
{\egroup\LT@listentry\LTcaptype}}%
% \end{macrocode}
-% |\ContinuedFloat| for longtable:\\
+% |\continuedfloat| for longtable:\\
% {\small(Commented out, since it's not deeply tested and quite useless anyway)}
% \Note{\package{hyperref} versions $<$ v6.76j uses $2\times$ \cs{hyper@makecurrent}}
% \begin{macrocode}
@@ -3917,24 +3482,24 @@
% \def\hyper@makecurrent####1{%
%% \let\@currentHlabel\Hy@LT@currentHlabel
% \let\@currentHref\Hy@LT@currentHref}}%
-% \let\caption@ORI@ContinuedFloat\ContinuedFloat
-% \def\ContinuedFloat{\noalign{%
+% \let\caption@ORI@continuedfloat\continuedfloat
+% \def\continuedfloat{\noalign{%
% \gdef\caption@setContinuedFloat{%
-% \let\caption@resetContinuedFloat\@gobble}%
+% \let\caption@reset@continuedfloat\@gobble}%
% \def\caption@setoptions####1{%
% \g@addto@macro\caption@setContinuedFloat{%
% \caption@setoptions{####1}}}%
% \let\@captype\LTcaptype
% \caption@ORI@ContinuedFloat}}%
% }{%
-% \def\ContinuedFloat{\noalign{%
+% \def\continuedfloat{\noalign{%
% \caption@Error{%
-% \noexpand\ContinuedFloat inside longtables\MessageBreak
+% \noexpand\continuedfloat inside longtables\MessageBreak
% is only available with `hypcap=true'}}}%
% }%
% \global\let\caption@setContinuedFloat\@empty
- \def\ContinuedFloat{\noalign{%
- \caption@Error{\noexpand\ContinuedFloat outside float}}}%
+ \def\continuedfloat{\noalign{%
+ \caption@Error{\noexpand\continuedfloat outside float}}}%
% \end{macrocode}
% |\bicaption| for longtable:
% \begin{macrocode}
@@ -4049,8 +3614,8 @@
% so we supress this skip if the \package{floatrow} package is loaded.
% (This fixes \issue{50})
% \begin{macrocode}
- \caption@ifundefined\FBifcaptop{}{%
- \let\caption@belowskip\@empty}%
+ \caption@ifdefined\FBifcaptop{%
+ \let\caption@belowskip\@empty}{}%
% \end{macrocode}
%
% The following code should look familiar. We do our skips and use
@@ -4113,7 +3678,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{The picinpar package}
+% \subsection{The picinpar package}
% \changes{v3.1}{2007/06/13}{Support of the \package{picinpar} package added}
%
% \begin{macrocode}
@@ -4197,7 +3762,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The picins package}
+% \subsection{The picins package}
% \changes{v3.0j}{2006/01/26}{Support of the \package{picins} package added}
%
% \begin{macro}{\piccaptiontype}
@@ -4334,7 +3899,7 @@
}
% \end{macrocode}
%
-% \subsubsection{The rotating package}
+% \subsection{The rotating package}
%
% \begin{macrocode}
\caption@IfPackageLoaded{rotating}[1995/08/22 v2.10]{%
@@ -4398,7 +3963,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The sidecap package}
+% \subsection{The sidecap package}
%
% \begin{macrocode}
\caption@IfPackageLoaded{sidecap}[2003/06/06 v1.6f]{%
@@ -4497,7 +4062,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The subfigure package}
+% \subsection{The subfigure package}
% \changes{v3.1}{2007/04/06}{subfigure package support added}
%
% \begin{macrocode}
@@ -4535,7 +4100,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The supertabular and xtab packages}
+% \subsection{The supertabular and xtab packages}
%
% \begin{macrocode}
\caption@IfPackageLoaded{supertabular}[2002/07/19 v4.1e]{%
@@ -4678,7 +4243,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The threeparttable package}
+% \subsection{The threeparttable package}
% \changes{v3.1}{2007/05/08}{Support of the \package{threeparttable} package added}
%
% \begin{macrocode}
@@ -4748,7 +4313,7 @@
}{}
% \end{macrocode}
%
-% \subsubsection{The wrapfig package}
+% \subsection{The wrapfig package}
% \changes{v3.1}{2007/05/05}{Support of the \package{wrapfig} package added}
% \changes{v3.2d}{2011/11/02}{Support of the \package{wrapfig} package rewritten}
%
diff --git a/macros/latex/contrib/caption/caption.ins b/macros/latex/contrib/caption/caption.ins
index 21368b1850..45381b8402 100644
--- a/macros/latex/contrib/caption/caption.ins
+++ b/macros/latex/contrib/caption/caption.ins
@@ -25,16 +25,13 @@ This work has the LPPL maintenance status "maintained".
This Current Maintainer of this work is Axel Sommerfeldt.
This work consists of the files
- CHANGELOG, README, SUMMARY, caption.ins,
- caption.dtx, caption2.dtx, caption3.dtx,
- bicaption.dtx, ltcaption.dtx, subcaption.dtx,
- newfloat.dtx, and totalcount.dtx
+ caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
+ bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
the derived files
caption.sty, caption2.sty, caption3.sty,
- bicaption.sty, ltcaption.sty, subcaption.sty,
- newfloat.sty, and totalcount.sty
+ bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
and the user manuals
- caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+ caption-deu.tex, caption-eng.tex, caption-rus.tex.
\endpreamble
@@ -44,7 +41,6 @@ and the user manuals
\generate{\file{bicaption.sty}{\from{bicaption.dtx}{package}}}
\generate{\file{ltcaption.sty}{\from{ltcaption.dtx}{package}}}
\generate{\file{subcaption.sty}{\from{subcaption.dtx}{package}}}
-\generate{\file{newfloat.sty}{\from{newfloat.dtx}{package}}}
\generate{\file{totalcount.sty}{\from{totalcount.dtx}{package}}}
\Msg{***********************************************************}
@@ -52,8 +48,7 @@ and the user manuals
\Msg{* To finish the installation you have to move the files}
\Msg{* `caption.sty', `caption2.sty', 'caption3.sty',}
\Msg{* `bicaption.sty', `ltcaption.sty', `subcaption.sty',}
-\Msg{* `newfloat.sty', and `totalcount.sty'}
-\Msg{* into a directory searched by TeX.}
+\Msg{* and `totalcount.sty' into a directory searched by TeX.}
\Msg{*}
\Msg{* To produce the documentation run the file}
\Msg{* `caption-eng.tex' (English version) or `caption-rus.tex'}
diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx
index bdffdcc66a..59e24f0fc1 100644
--- a/macros/latex/contrib/caption/caption3.dtx
+++ b/macros/latex/contrib/caption/caption3.dtx
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3961}
+% \CheckSum{3418}
%
% \iffalse
%<*driver>
@@ -38,9 +38,6 @@
\setlength\parindent{0pt}
\setlength\parskip{\smallskipamount}
%
-%\let\ORIsubsection\subsection
-%\def\subsection{\clearpage\ORIsubsection}
-%
\makeatletter % make room for subsections like 2.16.14 in the TOC
%\newcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}}
\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.7em}}
@@ -57,11 +54,8 @@
\ifpdf\usepackage{hypdestopt}\fi
\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
%
-\usepackage[debug]{caption3}[2018/05/01]
+\usepackage{caption3}[2019/09/09]
%
-\DeclareRobustCommand*\eTeX{\texorpdfstring
- {\leavevmode\hbox{$\varepsilon$}-\TeX}%
- {e-TeX}}
\DeclareRobustCommand*\AmS{\texorpdfstring
{{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
{AMS}}
@@ -90,8 +84,6 @@
% \newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
% \newcommand*\version[2][]{\textit{v#2}}
%
-% \GetFileInfo{caption3.drv}
-% \let\docdate\filedate
% \GetFileInfo{caption3.sty}
%
% \title{The Implementation of
@@ -100,7 +92,7 @@
% {the caption kernel}}
% \author{Axel Sommerfeldt\\
% \url{https://gitlab.com/axelsommerfeldt/caption}}
-% \date{\docdate}
+% \date{\filedate}
% \maketitle
%
% \begin{abstract}
@@ -187,25 +179,23 @@
% \fi
%
% \clearpage
-% \let\subsubsection\subsection
-% \let\subsection\section
%
% \iffalse
%<*package>
% \fi
%
-% \subsection{Identification}
+% \section{Identification}
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2019/09/01 v1.8d caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2019/09/09 v1.8e caption3 kernel (AR)]
% \end{macrocode}
%
-% \subsection{Workaround for bug in package \package{arabtex}}
+% \section{Workaround for bug in package \package{arabtex}}
% \package{arabtex} re-defines \cs{@gobble} as not-long so the packages of the
% \package{caption} package bundle are doomed to fail.
% Since this fatal bug won't be fixed in \package{arabtex} but we are dependent on a
-% proper definition of \cs{@gobble}, \cs{@firstofone}, \cs{@firstoftwo}, \cs{@secondoftwo}
+% proper definition of \cs{@gobble}, \cs{@firstofone}, \cs{@firstoftwo}, \cs{@secondoftwo},
% and so on we fix this here. (Sigh!)
% \begin{macrocode}
\providecommand\caption@FixArabTeX{%
@@ -223,7 +213,7 @@
\let\caption@FixArabTeX\@undefined}
% \end{macrocode}
%
-% \subsection{Generic helpers}
+% \section{Generic helpers}
%
% \begin{macro}{\@nameundef}
% This is the opposite to |\@namedef| which is offered by the \LaTeX\ kernel.
@@ -286,8 +276,8 @@
% \begin{macro}{\caption@ifundefined}
% \changes{v1.3a}{2011/08/12}{This macro added}
% \changes{v1.3b}{2011/08/18}{Made expandable}
-% Similar to \cs{@ifundefined} offered by the \LaTeX kernel, but does
-% not define the undefined macro as \cs{relax}.
+% Similar to \cs{@ifundefined} offered by the \LaTeX kernel,
+% but takes a macro as argument instead of a macro name.
% \begin{macrocode}
\newcommand*\caption@ifundefined[1]{%
\ifx#1\@undefined
@@ -300,6 +290,22 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@ifdefined}
+% \changes{v1.8e}{2018/05/11}{This macro added}
+% Similar to \cs{@ifundefined} offered by the \LaTeX kernel,
+% but takes a macro as argument instead of a macro name.
+% \begin{macrocode}
+\newcommand*\caption@ifdefined[1]{%
+ \ifx#1\@undefined
+ \expandafter\@secondoftwo
+ \else\ifx#1\relax
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \else
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \fi\fi}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\caption@ifinlist}
% \changes{v1.1}{2007/07/29}{Rewritten}
% This helper macro checks if the first argument is in the comma separated
@@ -505,53 +511,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\caption@CheckCommand}
-% \changes{v1.1}{2007/04/10}{This macro added}
-% \begin{macro}{\caption@IfCheckCommand}
-% \changes{v1.1}{2007/04/10}{This macro added}
-% \changes{v1.2b}{2008/08/02}{Revised so \cs{next} is no longer used}
-% \changes{v1.5}{2012/08/25}{Bugfix: Uses \cs{caption@tempa} instead of \cs{@tempa}}
-% |\caption@CheckCommand|\marg{macro}\marg{definition of macro}\par
-% checks if a command already exists, with the same definition.
-% It can be used more-than-once to check if one of multiple definitions will
-% finally match.
-% (It redefines itself later on to |\@gobbletwo| if the two commands match
-% fine, making further checks harmless.)\par
-% |\caption@IfCheckCommand|\marg{true}\marg{false}\par
-% will execute the \meta{true} code if one match was finally given,
-% the \meta{false} code otherwise.
-% (It simply checks if |\caption@CheckCommand| is |\@gobbletwo| and
-% restores the starting definition of |\caption@CheckCommand|.)
-% \begin{macrocode}
-\newcommand\caption@DoCheckCommand[2]{%
- \begingroup
- \let\caption@tempa#1%
- #2%
- \ifx\caption@tempa#1%
- \endgroup
- \let\caption@CheckCommand\@gobbletwo
- \else
- \endgroup
- \fi}
-\@onlypreamble\caption@DoCheckCommand
-% \end{macrocode}
-% \begin{macrocode}
-\let\caption@CheckCommand\caption@DoCheckCommand
-\@onlypreamble\caption@CheckCommand
-% \end{macrocode}
-% \begin{macrocode}
-\newcommand*\caption@IfCheckCommand{%
- \ifx\caption@CheckCommand\@gobbletwo
- \let\caption@CheckCommand\caption@DoCheckCommand
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi}
-\@onlypreamble\caption@IfCheckCommand
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \begin{macro}{\caption@AtBeginDocument}
% \changes{v1.1}{2007/04/13}{This macro and its usage added}
% \changes{v1.2e}{2010/01/09}{Adapted to the combine document class}
@@ -591,7 +550,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Information, Warnings, and Errors}
+% \section{Information, Warnings, and Errors}
%
% \begin{macro}{\caption@Info}
% \changes{v1.3}{2010/10/25}{Moved from package to kernel}
@@ -658,7 +617,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Using the keyval package}
+% \section{Using the keyval package}
%
% We need the \package{keyval} package for option handling, so we load it here.
% \begin{macrocode}
@@ -1127,7 +1086,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Margin resp. width}
+% \section{Margin resp. width}
% \changes{v1.0n}{2007/04/01}{\cs{captionmarginx} renamed to \cs{captionmargin@}}
% \changes{v1.0n}{2007/04/03}{Option `twoside' added}
% \changes{v1.1}{2007/08/11}{Options `margin*', `minmargin', and `maxmargin' added}
@@ -1369,7 +1328,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Indentions}
+% \section{Indentions}
%
% \begin{macro}{\caption@indent}
% \changes{v1.1}{2007/07/29}{Renamed from \cs{captionindent} to \cs{caption@indent}}
@@ -1404,59 +1363,7 @@
\l@addto@macro\caption@@par{\setlength\parskip{#1}}}
% \end{macrocode}
%
-% \changes{v1.0f}{2005/08/22}{Increased compatibility to KOMA-Script:
-% A special version of options `parindent' and `parskip' added}
-% \changes{v1.0g}{2006/01/03}{Bugfix 06-01-03: KOMA-Script variants of
-% `parskip' and `parindent' options revised and moved into caption kernel}
-% \changes{v1.0h}{2006/02/23}{KOMA-Script variants of `parskip' and
-% `parindent' are obsolete now, removed}
-% \changes{v1.0m}{2007/03/30}{KOMA-Script variants of `parskip' and
-% `parindent' re-added, since they still collide with the current
-% version of the subfig package (Sigh!)}
-%
-% There is an option clash between the \KOMAScript\ document classes
-% and the \package{caption} kernel, both define the options |parindent| and
-% |parskip| but with different meaning.
-% Furthermore the ones defined by the \package{caption} kernel take a
-% value as parameter but the \KOMAScript\ ones do not.
-% So we need special versions of the options |parindent| and |parskip| here
-% which determine if a value is given (and therefore should be treated as
-% our option) or not (and therefore should be ignored by us).\footnote{%^^A
-% This problem was completely solved due a change of \cs{caption@ProcessOptions}
-% in \thispackage\ \version{1.0h}, but we still need this workaround since
-% these options would otherwise still collide with the current version $1.3$
-% of the \package{subfig} package (Sigh!)}
-% \begin{macrocode}
-\providecommand*\caption@ifkomaclass{%
- \caption@ifundefined\scr@caption\@gobble\@firstofone}
-\@onlypreamble\caption@ifkomaclass
-% \end{macrocode}
-% \begin{macrocode}
-\caption@ifkomaclass{%
-% \end{macrocode}
-% \begin{macrocode}
- \let\caption@KV@parindent\KV@caption@parindent
- \DeclareCaptionOption{parindent}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parindent' ignored}%
- \else
- \caption@KV@parindent{#1}%
- \fi}%
-% \end{macrocode}
-% \begin{macrocode}
- \let\caption@KV@parskip\KV@caption@parskip
- \DeclareCaptionOption{parskip}[]{%
- \ifx,#1,%
- \caption@Debug{Option `parskip' ignored}%
- \else
- \caption@KV@parskip{#1}%
- \fi}%
-% \end{macrocode}
-% \begin{macrocode}
-}
-% \end{macrocode}
-%
-% \subsection{Styles}
+% \section{Styles}
%
% \begin{macro}{\DeclareCaptionStyle}
% \changes{v1.0a}{2004/01/17}{Pass through argument \#3 so extra spaces
@@ -1564,7 +1471,7 @@
\DeclareCaptionOption{slc}[1]{\KV@caption@singlelinecheck{#1}}
% \end{macrocode}
%
-% \subsection{Boxes}
+% \section{Boxes}
%
% \begin{macro}{\DeclareCaptionBox}
% \changes{v1.5}{2012/03/15}{This macro added}
@@ -1627,7 +1534,7 @@
\def\caption@box@default{\caption@box@none}
% \end{macrocode}
%
-% \subsection{Formats}
+% \section{Formats}
%
% \begin{macro}{\DeclareCaptionFormat}
% \changes{v1.0a}{2004/01/17}{Pass through argument \#3 so extra spaces
@@ -1720,7 +1627,7 @@
\DeclareCaptionDefaultFormat{plain}
% \end{macrocode}
%
-% \subsection{Label formats}
+% \section{Label formats}
%
% \begin{macro}{\DeclareCaptionLabelFormat}
% \changes{v1.0a}{2004/01/17}{%
@@ -1768,7 +1675,7 @@
\def\caption@lfmt@default{\caption@lfmt@simple}
% \end{macrocode}
%
-% \subsection{Label separators}
+% \section{Label separators}
%
% \begin{macro}{\DeclareCaptionLabelSeparator}
% \changes{v1.0a}{2004/01/17}{Pass through argument \#2 so extra spaces
@@ -1856,7 +1763,7 @@
\caption@set@default@labelsep{colon}
% \end{macrocode}
%
-% \subsection{Text formats}
+% \section{Text formats}
%
% \begin{macro}{\DeclareCaptionTextFormat}
% \changes{v1.0j}{2007/02/18}{This macro added}
@@ -1953,7 +1860,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Fonts}
+% \section{Fonts}
%
% \begin{macro}{\DeclareCaptionFont}
% \changes{v1.0a}{2004/01/22}{%
@@ -2151,8 +2058,8 @@
% \changes{v1.2d}{2009/10/09}{Bugfix 09-05-18: \package{setspace} package support revised}
% \begin{macrocode}
\DeclareCaptionFont{singlespacing}{%
- \caption@ifundefined\setspace@singlespace{}{%
- \setstretch\setspace@singlespace}}% normally 1
+ \caption@ifdefined\setspace@singlespace{%
+ \setstretch\setspace@singlespace}{}}% normally 1
\DeclareCaptionFont{onehalfspacing}{\onehalfspacing}
\DeclareCaptionFont{doublespacing}{\doublespacing}
\DeclareCaptionFont{stretch}{\setstretch{#1}}
@@ -2178,7 +2085,7 @@
\DeclareCaptionDefaultFont{size}{}
% \end{macrocode}
%
-% \subsection{Justifications}
+% \section{Justifications}
%
% \begin{macro}{\DeclareCaptionJustification}
% \changes{v1.0a}{2004/01/17}{Pass through argument \#2 so extra spaces
@@ -2261,7 +2168,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{The ragged2e package}
+% \subsection{The ragged2e package}
% \changes{v1.0b}{2004/05/16}{Improved \package{ragged2e} package support}
%
% We also support the upper-case commands offered by the \package{ragged2e}
@@ -2353,7 +2260,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Vertical spaces before and after captions}
+% \section{Vertical spaces before and after captions}
%
% \begin{macro}{\abovecaptionskip}
% \begin{macro}{\belowcaptionskip}
@@ -2392,7 +2299,7 @@
\DeclareCaptionOption{rule}[1]{\caption@set@bool\caption@ifrule{#1}}
% \end{macrocode}
%
-% \subsection{Positioning}
+% \section{Positioning}
%
% These macros handle the right position of the caption.
% Note that the position is actually \emph{not} controlled by the
@@ -2517,7 +2424,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Hooks}
+% \section{Hooks}
%
% \begin{macro}{\AtBeginCaption}
% \begin{macro}{\AtEndCaption}
@@ -2533,7 +2440,7 @@
% \end{macro}
% \end{macro}
%
-% \subsection{Lists}
+% \section{Lists}
%
% \changes{v1.0b}{2004/05/16}{Option \opt{listof=} added}
% \changes{v1.2}{2007/11/17}{Option \opt{list=} added}
@@ -2642,7 +2549,7 @@
\caption@set@default@listformat{subsimple}
% \end{macrocode}
%
-% \subsection{Debug option}
+% \section{Debug option}
% \changes{v1.0k}{2007/03/04}{Debug option added}
%
% \begin{macrocode}
@@ -2659,44 +2566,73 @@
\setkeys{caption}{debug=0}
% \end{macrocode}
%
-% \subsection{Document classes \& Babel support}
-%
-% \subsubsection{The standard \texorpdfstring{\LaTeX{}}{LaTeX} classes}
+% \section{Document classes \& Babel support}
%
+% \begin{macro}{\caption@ifdocumentclass}
+% Boolean switch which is set if the document class could be detected successfully,
+% i.e. |\caption@document|\-|class| is set to a proper value.
+% (If |\caption@document|\-|class| is already set, this flag will also be set.)
% \begin{macrocode}
-\caption@CheckCommand\@makecaption{%
- % article|report|book [2005/09/16 v1.4f Standard LaTeX document class]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1: #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
+\caption@setbool{documentclass}{1}
% \end{macrocode}
+% \end{macro}
%
-% \subsubsection{The elsarticle classes}
-% \changes{v1.5}{2013/01/06}{elsarticle class support added}
-%
-% \begin{macro}{\caption@ifelsarticleclass}
+% \begin{macro}{\caption@documentclass}
+% \changes{v1.8e}{2018/05/11}{This macro added}
+% Determine document class used.
+% Set |\caption@document|\-|class| by good-guessing, if not already set.
% \begin{macrocode}
-\providecommand*\caption@ifelsarticleclass{%
- \@ifclassloaded{elsarticle}\@firstofone\@gobble}
-\@onlypreamble\caption@ifelsarticleclass
+\caption@ifundefined\caption@documentclass{%
+% \end{macrocode}
+% \begin{macrocode}
+ \@ifclassloaded{beamer}{%
+ \caption@InfoNoLine{beamer document class detected}%
+ \def\caption@documentclass{beamer}%
% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
-\caption@ifelsarticleclass{%
+ }{\@ifclassloaded{elsarticle}{%
+ \caption@InfoNoLine{elsarticle document class detected}%
+ \def\caption@documentclass{elsarticle}%
% \end{macrocode}
% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % elsarticle.cls,v 1.20 2008-10-13 04:24:12 cvr Exp
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip\footnotesize
+ }{\@ifclassloaded{memoir}{%
+ \caption@InfoNoLine{memoir document class detected}%
+ \def\caption@documentclass{memoir}%
+% \end{macrocode}
+% \begin{macrocode}
+ }{\caption@ifdefined\scr@caption{%
+ \caption@InfoNoLine{KOMA-Script document class detected}%
+ \def\caption@documentclass{koma}%
+% \end{macrocode}
+% If |\@captionheadfont| is defined, we assume it's a AMS or SMF document class.
+% \begin{macrocode}
+ }{\caption@ifdefined\@captionheadfont{%
+ \caption@InfoNoLine{AMS or SMF document class detected}%
+ \def\caption@documentclass{ams}%
+% \end{macrocode}
+% If |\@CaptionFonts| is defined, we assume it's a NTG Dutch document class.
+% \begin{macrocode}
+ }{\caption@ifdefined\CaptionFonts{%
+ \caption@InfoNoLine{NTG document class detected}%
+ \def\caption@documentclass{ntg}%
+% \end{macrocode}
+% If |\cph@font| and |\cpb@font| are defined, we assume it's a NTG Dutch document class.
+% \begin{macrocode}
+ }{\caption@ifdefined\cph@font{%
+ \caption@ifdefined\cpb@font\@firstoftwo\@secondoftwo
+ }{%
+ \@secondoftwo
+ }{%
+ \caption@InfoNoLine{thesis document class detected}%
+ \def\caption@documentclass{thesis}%
+ }{%
+% \end{macrocode}
+% If the definition of |\@makecaption| matches the one from the standard \LaTeX\ document classes
+% |article|, |report|, or |book|, we assume it's either one of them or is compatible to them.
+% \begin{macrocode}
+ % article|report|book [2005/09/16 v1.4f Standard LaTeX document class]
+ \long\def\caption@tempa#1#2{%
+ \vskip\abovecaptionskip
\sbox\@tempboxa{#1: #2}%
\ifdim \wd\@tempboxa >\hsize
#1: #2\par
@@ -2705,98 +2641,68 @@
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}}
+ \ifx\caption@tempa\@makecaption
+ \caption@InfoNoLine{Standard document class detected}%
+ \else
% \end{macrocode}
+% Otherwise we are clueless and use standard default settings for the captions anyway.
+% (And we unset the |document|\-|class| flag to indicate that the content of |\caption@document|\-|class| is not correct.)
% \begin{macrocode}
- \DeclareCaptionDefaultFont{font}{\footnotesize}
+ \caption@InfoNoLine{%
+ Unknown document class (or package),\MessageBreak
+ standard defaults will be used}%
+ \caption@InfoNoLine{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
+ \caption@setbool{documentclass}{0}%
+ \fi
+ \def\caption@documentclass{base}%
+ }}}}}}%
+}{}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption@ifclassloaded}
+% \changes{v1.8e}{2019/09/09}{This macro added}
+% |\caption@ifclassloaded|\marg{name}\marg{yes-code}\marg{no-code}
% \begin{macrocode}
-}
+\newcommand*\caption@ifclassloaded[1]{%
+ \edef\caption@tempa{#1}%
+ \ifx\caption@tempa\caption@documentclass
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
% \end{macrocode}
+% \end{macro}
%
-% \subsubsection{The \AmS{} \& \SmF{} classes}
-% \changes{v1.1}{2007/07/29}{\AmS\ \& \SmF\ classes support added}
+% \subsection{The standard \texorpdfstring{\LaTeX{}}{LaTeX} classes}
+%
+% Since this is the default, there is no extra work to be done here.
+%
+% \subsection{The elsarticle classes}
+% \changes{v1.5}{2013/01/06}{elsarticle class support added}
%
-% \begin{macro}{\caption@ifamsclass}
% \begin{macrocode}
-\providecommand*\caption@ifamsclass{%
- \caption@ifundefined\@captionheadfont\@gobble\@firstofone}
-\@onlypreamble\caption@ifamsclass
+\caption@ifclassloaded{elsarticle}{%
% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
-\caption@ifamsclass{%
+ \DeclareCaptionDefaultFont{font}{\footnotesize}
% \end{macrocode}
% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % amsart|amsproc|amsbook [2004/08/06 v2.20]
- \long\def\@makecaption#1#2{%
- \setbox\@tempboxa\vbox{\color@setgroup
- \advance\hsize-2\captionindent\noindent
- \@captionfont\@captionheadfont#1\@xp\@ifnotempty\@xp
- {\@cdr#2\@nil}{.\@captionfont\upshape\enspace#2}%
- \unskip\kern-2\captionindent\par
- \global\setbox\@ne\lastbox\color@endgroup}%
- \ifhbox\@ne % the normal case
- \setbox\@ne\hbox{\unhbox\@ne\unskip\unskip\unpenalty\unkern}%
- \fi
- \ifdim\wd\@tempboxa=\z@ % this means caption will fit on one line
- \setbox\@ne\hbox to\columnwidth{\hss\kern-2\captionindent\box\@ne\hss}%
- \else % tempboxa contained more than one line
- \setbox\@ne\vbox{\unvbox\@tempboxa\parskip\z@skip
- \noindent\unhbox\@ne\advance\hsize-2\captionindent\par}%
- \fi
- \ifnum\@tempcnta<64 % if the float IS a figure...
- \addvspace\abovecaptionskip
- \hbox to\hsize{\kern\captionindent\box\@ne\hss}%
- \else % if the float IS NOT a figure...
- \hbox to\hsize{\kern\captionindent\box\@ne\hss}%
- \nobreak
- \vskip\belowcaptionskip
- \fi
- \relax
- }}
+}{}
% \end{macrocode}
+%
+% \subsection{The \AmS{} \& \SmF{} classes}
+% \changes{v1.1}{2007/07/29}{\AmS\ \& \SmF\ classes support added}
+%
% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % smfart|smfbook [1999/11/15 v1.2f Classe LaTeX pour les articles publies par la SMF]
- \long\def\@makecaption#1#2{%
- \ifdim\captionindent>.1\hsize \captionindent.1\hsize \fi
- \setbox\@tempboxa\vbox{\color@setgroup
- \advance\hsize-2\captionindent\noindent
- \@captionfont\@captionheadfont#1\@xp\@ifnotempty\@xp
- {\@cdr#2\@nil}{\@addpunct{.}\@captionfont\upshape\enspace#2}%
- \unskip\kern-2\captionindent\par
- \global\setbox\@ne\lastbox\color@endgroup}%
- \ifhbox\@ne % the normal case
- \setbox\@ne\hbox{\unhbox\@ne\unskip\unskip\unpenalty\unkern}%
- \fi
- \ifdim\wd\@tempboxa=\z@ % this means caption will fit on one line
- \setbox\@ne\hbox to\columnwidth{\hss\kern-2\captionindent\box\@ne\hss}%
- \@tempdima\wd\@ne\advance\@tempdima-\captionindent
- \wd\@ne\@tempdima
- \else % tempboxa contained more than one line
- \setbox\@ne\vbox{\rightskip=0pt plus\captionindent\relax
- \unvbox\@tempboxa\parskip\z@skip
- \noindent\unhbox\@ne\advance\hsize-2\captionindent\par}%
- \fi
- \ifnum\@tempcnta<64 % if the float IS a figure...
- \addvspace\abovecaptionskip
- \noindent\kern\captionindent\box\@ne
- \else % if the float IS NOT a figure...
- \noindent\kern\captionindent\box\@ne
- \nobreak
- \vskip\belowcaptionskip
- \fi
- \relax
- }}
+\caption@ifclassloaded{ams}{%
% \end{macrocode}
% \begin{macrocode}
\let\captionmargin\captionindent % set to 3pc by AMS class
\begingroup\edef\@tempa{\endgroup
\noexpand\caption@g@addto@list\noexpand\caption@sty@default
{margin=\the\captionmargin
- \caption@ifundefined\smf@makecaption{}{,maxmargin=.1\linewidth}}}
+ \caption@ifdefined\smf@makecaption{,maxmargin=.1\linewidth}{}}}
\@tempa
\caption@g@addto@list\caption@sls@default{margin*=.5\captionmargin}
\DeclareCaptionLabelSeparator{default}{.\enspace}
@@ -2807,10 +2713,10 @@
\captionsetup[table]{position=t}
% \end{macrocode}
% \begin{macrocode}
-}
+}{}
% \end{macrocode}
%
-% \subsubsection{The beamer class (Part one)}
+% \subsection{The beamer class (Part one)}
% \changes{v1.1}{2007/03/10}{\package{beamer} class support added}
% \changes{v1.3}{2011/08/06}{\package{beamer} class support revised}
% \changes{v1.5}{2013/04/27}{The \package{beamer} template \texttt{caption label separator} will be used now}
@@ -2818,33 +2724,8 @@
% \changes{v1.7}{2018/04/15}{Re-definition of label format \texttt{simpleMagyar} revised}
% \changes{v1.7}{2018/05/01}{Definition of \package{beamer} default label font revised}
%
-% \begin{macro}{\caption@ifbeamerclass}
-% \begin{macrocode}
-\providecommand*\caption@ifbeamerclass{%
- \@ifclassloaded{beamer}\@firstofone\@gobble}
-\@onlypreamble\caption@ifbeamerclass
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
-\caption@ifbeamerclass{%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\beamer@makecaption{%
- % beamerbaselocalstructure.sty,v 1.53 2007/01/28 20:48:21 tantau
- \long\def\beamer@makecaption#1#2{%
- \def\insertcaptionname{\csname#1name\endcsname}%
- \def\insertcaptionnumber{\csname the#1\endcsname}%
- \def\insertcaption{#2}%
- \nobreak\vskip\abovecaptionskip\nobreak
- \sbox\@tempboxa{\usebeamertemplate**{caption}}%
- \ifdim \wd\@tempboxa >\hsize
- \usebeamertemplate**{caption}\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \nobreak\vskip\belowcaptionskip\nobreak}}
+\caption@ifclassloaded{beamer}{%
% \end{macrocode}
%
% \begin{macro}{\caption@ifbeamertemplate}
@@ -2926,38 +2807,14 @@
% \begin{macrocode}
%
% \begin{macrocode]
-}
+}{}
% \end{macrocode}
%
-% \subsubsection{The KOMA-Script classes}
+% \subsection{The KOMA-Script classes}
% \changes{v1.1}{2007/03/31}{\KOMAScript\ classes support added}
%
-% \begin{macro}{\caption@ifkomaclass}
% \begin{macrocode}
-\providecommand*\caption@ifkomaclass{%
- \caption@ifundefined\scr@caption\@gobble\@firstofone}
-\@onlypreamble\caption@ifkomaclass
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
-\caption@ifkomaclass{%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % scrartcl|scrreprt|scrbook [2007/03/07 v2.97a KOMA-Script document class]
- \long\def\@makecaption#1#2{%
- \if@captionabove
- \vskip\belowcaptionskip
- \else
- \vskip\abovecaptionskip
- \fi
- \@@makecaption\@firstofone{#1}{#2}%
- \if@captionabove
- \vskip\abovecaptionskip
- \else
- \vskip\belowcaptionskip
- \fi}}
+\caption@ifclassloaded{koma}{%
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionFormat{default}[#1#2#3\par]{%
@@ -2981,74 +2838,71 @@
\DeclareCaptionDefaultFont{font}{\scr@fnt@caption}
\DeclareCaptionDefaultFont{labelfont}{\scr@fnt@captionlabel}
% \end{macrocode}
-% \begin{macrocode}
-}
-% \end{macrocode}
%
-% \subsubsection{The \NTG{} Dutch classes}
-% \changes{v1.1}{2007/04/06}{NTG classes support added}
+% \changes{v1.0f}{2005/08/22}{Increased compatibility to KOMA-Script:
+% A special version of options `parindent' and `parskip' added}
+% \changes{v1.0g}{2006/01/03}{Bugfix 06-01-03: KOMA-Script variants of
+% `parskip' and `parindent' options revised and moved into caption kernel}
+% \changes{v1.0h}{2006/02/23}{KOMA-Script variants of `parskip' and
+% `parindent' are obsolete now, removed}
+% \changes{v1.0m}{2007/03/30}{KOMA-Script variants of `parskip' and
+% `parindent' re-added, since they still collide with the current
+% version of the subfig package (Sigh!)}
%
-% \begin{macro}{\caption@ifntgclass}
+% There is an option clash between the \KOMAScript\ document classes
+% and the \package{caption} kernel, both define the options |parindent| and
+% |parskip| but with different meaning.
+% Furthermore the ones defined by the \package{caption} kernel take a
+% value as parameter but the \KOMAScript\ ones do not.
+% So we need special versions of the options |parindent| and |parskip| here
+% which determine if a value is given (and therefore should be treated as
+% our option) or not (and therefore should be ignored by us).\footnote{%^^A
+% This problem was completely solved due a change of \cs{caption@ProcessOptions}
+% in \thispackage\ \version{1.0h}, but we still need this workaround since
+% these options would otherwise still collide with the current version $1.3$
+% of the \package{subfig} package (Sigh!)}
% \begin{macrocode}
-\providecommand*\caption@ifntgclass{%
- \caption@ifundefined\CaptionFonts\@gobble\@firstofone}
-\@onlypreamble\caption@ifntgclass
+ \let\caption@KV@parindent\KV@caption@parindent
+ \DeclareCaptionOption{parindent}[]{%
+ \ifx,#1,%
+ \caption@Debug{Option `parindent' ignored}%
+ \else
+ \caption@KV@parindent{#1}%
+ \fi}%
% \end{macrocode}
-% \end{macro}
-%
% \begin{macrocode}
-\caption@ifntgclass{%
+ \let\caption@KV@parskip\KV@caption@parskip
+ \DeclareCaptionOption{parskip}[]{%
+ \ifx,#1,%
+ \caption@Debug{Option `parskip' ignored}%
+ \else
+ \caption@KV@parskip{#1}%
+ \fi}%
% \end{macrocode}
% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % artikel|rapport|boek [2004/06/07 v2.1a NTG LaTeX document class]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{{\CaptionLabelFont#1:} \CaptionTextFont#2}%
- \ifdim \wd\@tempboxa >\hsize
- {\CaptionLabelFont#1:} \CaptionTextFont#2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
+}{}
+% \end{macrocode}
+%
+% \subsection{The \NTG{} Dutch classes}
+% \changes{v1.1}{2007/04/06}{NTG classes support added}
+%
+% \begin{macrocode}
+\caption@ifclassloaded{ntg}{%
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionDefaultFont{labelfont}{\CaptionLabelFont}
\DeclareCaptionDefaultFont{textfont}{\CaptionTextFont}
% \end{macrocode}
% \begin{macrocode}
-}
+}{}
% \end{macrocode}
%
-% \subsubsection{The thesis class}
+% \subsection{The thesis class}
% \changes{v1.2a}{2008/01/31}{thesis class support added}
% \changes{v1.2e}{2009/11/15}{Bugfix 09-11-14: thesis class support revised}
%
-% \begin{macro}{\caption@ifthesisclass}
% \begin{macrocode}
-\providecommand*\caption@ifthesisclass{%
- \caption@ifundefined\cph@font
- {\@gobble}%
- {\caption@ifundefined\cpb@font\@gobble\@firstofone}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macrocode}
-\caption@ifthesisclass{%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % thesis.cls 1996/25/01 1.0g LaTeX document class (wm).
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \setbox\@tempboxa\hbox{{\cph@font #1:} {\cpb@font #2}}%
- \ifdim \wd\@tempboxa >\hsize
- \@hangfrom{\cph@font #1: }{\cpb@font #2\par}%
- \else
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
+\caption@ifclassloaded{thesis}{%
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionDefaultFormat{hang}
@@ -3056,23 +2910,23 @@
\DeclareCaptionDefaultFont{textfont}{\cpb@font}
% \end{macrocode}
% \begin{macrocode}
-}
+}{}
% \end{macrocode}
%
-% \subsubsection{The arabic Babel option}
+% \subsection{The arabic Babel option}
% \changes{v1.8}{2018/05/20}{\package{arabic} babel package support added}
%
% \begin{macrocode}
-\caption@ifundefined\ArabiCoreLoaded{%
+\caption@ifdefined\ArabiCoreLoaded{%
% \end{macrocode}
+%
% \begin{macro}{\caption@rl}
% \changes{v1.8}{2018/05/20}{This macro added}
% \begin{macrocode}
- \let\caption@rl\@firstofone
-}{%
\newcommand\caption@rl[1]{\if@rl\textRL{#1}\else\textLR{#1}\fi}
% \end{macrocode}
% \end{macro}
+%
% \begin{macrocode}
\def\fnum@figure{\figurename\nobreakspace\thefigure}%
\def\fnum@table{\tablename\nobreakspace\thetable}%
@@ -3083,51 +2937,16 @@
\if@rl\caption@lsep@arabi\else\caption@lsep@colon\fi}
% \end{macrocode}
% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % arabicore.sty [2006/01/01 v1.0 Arabi Core switching commands (may still change)]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1: #2}%
- \sbox\@Arabitempboxa{\textRL{#2} : #1}%
- \if@rl{
- \ifdim \wd\@Arabitempboxa >\hsize
- \textRL{#2} : #1\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@Arabitempboxa\hfil}%
- \fi}\else{
- \ifdim \wd\@tempboxa >\hsize
- #1: #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi}\fi
- \vskip\belowcaptionskip}}
-% \end{macrocode}
-% \begin{macrocode}
+}{%
+ \let\caption@rl\@firstofone
}
% \end{macrocode}
%
-% \subsubsection{The frenchb Babel option}
+% \subsection{The frenchb Babel option}
% \changes{v1.1}{2006/05/14}{\package{frenchb} babel package support added}
%
% \begin{macrocode}
-\caption@ifundefined\FB@makecaption{}{%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % frenchb.ldf [2005/02/06 v1.6g French support from the babel system]
- % frenchb.ldf [2007/10/05 v2.0e French support from the babel system]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1\CaptionSeparator #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1\CaptionSeparator #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}
+\caption@ifdefined\FB@makecaption{%
% \end{macrocode}
% \begin{macrocode}
\ifx\@makecaption\STD@makecaption
@@ -3145,69 +2964,24 @@
\fi
% \end{macrocode}
% \begin{macrocode}
-}
+}{}
% \end{macrocode}
%
-% \subsubsection{The frenchle/pro package}
+% \subsection{The frenchle/pro package}
% \changes{v1.1}{2006/05/14}{\package{frenchle/pro} package support added}
%
% \begin{macrocode}
-\caption@ifundefined\frenchTeXmods{}{%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % french(le).sty [2006/10/03 The french(le) package /V5,9991/]
- % french(le).sty [2007/06/28 The french(le) package /V5,9994/]
- \def\@makecaption#1#2{%
- \ifFTY%
- \def\@secondofmany##1##2\void{##2}%
- \def\@tempa{\@secondofmany#2\void}%
- \ifx\@tempa\empty%
- \let\captionseparator\empty%
- \fi%
- \@mcORI{#1}{\relax\captionfont{#2}}%
- \else
- \@mcORI{#1}{#2}%
- \fi}}%
-% \end{macrocode}
-% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % french(le).sty [2007/02/11 The french(le) package /V5,9993/]
- \def\@makecaption#1#2{%
- \ifFTY%
- \def\@secondofmany##1##2\void{##2}%
- \protected@edef\@tempa{\@secondofmany#2\void}%
- \ifx\@tempa\empty%
- \let\captionseparator\empty%
- \fi%
- \@mcORI{#1}{\relax\captionfont{#2}}%
- \else
- \@mcORI{#1}{#2}%
- \fi}}%
+\caption@ifdefined\frenchTeXmods{%
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionDefaultFont{textfont}{\itshape}%
\DeclareCaptionLabelSeparator{default}{\captionseparator\space}%
% \end{macrocode}
% \begin{macrocode}
-}
-% \end{macrocode}
-%
-% \subsubsection{The hebrew Babel option}
-% \changes{v1.8}{2018/08/26}{\package{hebrew} package support added}
-%
-% \begin{macrocode}
- \caption@CheckCommand\@makecaption{%
- % rlbabel.def [2005/03/30 v2.3h Right-to-Left support from the babel system Hebrew language support from the babel system]
- \long\def\@makecaption#1#2{%
- \vskip\abovecaptionskip%
- \begin{center}%
- #1: #2%
- \end{center} \par%
- \vskip\belowcaptionskip}}%
+}{}
% \end{macrocode}
%
-% \subsubsection{The hungarian and magyar Babel option}
+% \subsection{The hungarian and magyar Babel option}
% \changes{v1.3}{2009/03/29}{\package{magyar} package support added}
% \changes{v1.3a}{2011/08/12}{\package{magyar} package support revised}
% \changes{v1.8b}{2018/08/26}{\package{magyar} package support revised}
@@ -3217,22 +2991,6 @@
% \end{macrocode}
%
% \begin{macrocode}
-\caption@ifundefined\hunnewlabel{}{%
- \caption@CheckCommand\@makecaption{%
- % magyar.ldf [2005/03/30 v1.4j Magyar support from the babel system]
- \def\@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1. #2}%
- \ifdim \wd\@tempboxa >\hsize
- {#1. #2\csname par\endcsname}
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}}}
-% \end{macrocode}
-%
-% \begin{macrocode}
\def\caption@tempa#1{%
\@ifpackagewith{babel}{#1}{%
\caption@InfoNoLine{#1 babel option is loaded}%
@@ -3253,22 +3011,7 @@
%
% TODO: babel-latvian/latvian.ldf
%
-% \subsubsection{Unknown document class (or package)}
-% \changes{v1.1}{2007/04/10}{Check of document class added}
-%
-% \begin{macrocode}
-\caption@IfCheckCommand{%
- \caption@setbool{documentclass}{1}%
-}{%
- \caption@setbool{documentclass}{0}%
- \caption@InfoNoLine{%
- Unknown document class (or package),\MessageBreak
- standard defaults will be used}%
- \caption@Debug{\string\@makecaption\space=\space\meaning\@makecaption\@gobble}%
-}
-% \end{macrocode}
-%
-% \subsection{Execution of options}
+% \section{Execution of options}
%
% \begin{macrocode}
\captionsetup{style=default,position=default,%
@@ -3278,7 +3021,7 @@
\ProcessOptions*
% \end{macrocode}
%
-% \subsection{Making an `List of' entry}
+% \section{Making an `List of' entry}
%
% \begin{macro}{\caption@addcontentsline}
% \changes{v1.1}{2007/07/01}{This macro added}
@@ -3299,13 +3042,13 @@
\caption@ifcontentsline{#2}{%
\begingroup
\let\@tempa\@gobble
- \caption@ifundefined\caption@listtype
- {\edef\caption@listtype{#1}}%
+ \caption@ifdefined\caption@listtype
{\let\@tempa\@firstofone}%
- \caption@ifundefined\caption@listtype@ext
- {}%
+ {\edef\caption@listtype{#1}}%
+ \caption@ifdefined\caption@listtype@ext
{\edef\caption@listtype{\caption@listtype\caption@listtype@ext}%
\let\@tempa\@firstofone}%
+ {}%
\@tempa
{\caption@Debug{addcontentsline: #1 => \caption@listtype}%
% \caption@setoptions\caption@listtype
@@ -3333,8 +3076,8 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@@addcontentsline[4]{%
-% \caption@ifundefined\main@Arabi@language{}%
-% {\addtocontents{#1}{\xstring\select@language{\main@Arabi@language}}}%
+% \caption@ifdefined\main@Arabi@language
+% {\addtocontents{#1}{\xstring\select@language{\main@Arabi@language}}}{}%
\addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}}
% \end{macrocode}
% \begin{macrocode}
@@ -3356,7 +3099,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Typesetting the caption}
+% \section{Typesetting the caption}
%
% \begin{macro}{\ifcaption@star}
% If the starred form of |\caption| is used, this will be set to |true|.
@@ -3833,7 +3576,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Types \& sub-types}
+% \section{Types \& sub-types}
%
% \begin{macro}{\DeclareCaptionType}
% \changes{v1.1}{2007/08/12}{This macro added}
@@ -3860,13 +3603,13 @@
% will execute the given code for all (known) floating environments.
% \begin{macrocode}
\newcommand\caption@ForEachType[1]{%
- \caption@ifundefined\ForEachFloatingEnvironment
+ \caption@ifdefined\ForEachFloatingEnvironment
+ {\ForEachFloatingEnvironment{#1}}%
{\def\@elt##1{#1}%
- \caption@ifundefined\c@figure\@gobble\@elt{figure}%
- \caption@ifundefined\c@table\@gobble\@elt{table}%
+ \caption@ifdefined\c@figure\@elt\@gobble{figure}%
+ \caption@ifdefined\c@table\@elt\@gobble{table}%
\let\@elt\relax
- \newfloat@addtohook{#1}}%
- {\ForEachFloatingEnvironment{#1}}}
+ \newfloat@addtohook{#1}}}
% \end{macrocode}
% \begin{macrocode}
\providecommand\newfloat@addtohook[1]{%
@@ -3920,8 +3663,8 @@
% \end{macrocode}
% Support of \package{titletoc} package
% \begin{macrocode}
- \caption@ifundefined\contentsuse{}{%
- \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}%
+ \caption@ifdefined\contentsuse{%
+ \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}{}%
% \end{macrocode}
% \begin{macrocode}
\@namedef{sub#3name}{}%
@@ -3939,9 +3682,9 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@declaresublistentry{%
- \caption@ifundefined\l@chapter
- {\caption@@declaresublistentry\l@subsubsection}%
- {\caption@@declaresublistentry\l@subsection}}
+ \caption@ifdefined\l@chapter
+ {\caption@@declaresublistentry\l@subsection}%
+ {\caption@@declaresublistentry\l@subsubsection}}
\@onlypreamble\caption@declaresublistentry
% \end{macrocode}
% \begin{macrocode}
@@ -4062,7 +3805,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{subfig package adaptions}
+% \section{subfig package adaptions}
% \changes{v1.1}{2007/07/07}{Several adaptions to the \package{subfig} package added}
% \changes{v1.4a}{2011/11/01}{Bugfix 11-11-01: Test for the \package{subfig} package revised}
%
diff --git a/macros/latex/contrib/caption/subcaption.dtx b/macros/latex/contrib/caption/subcaption.dtx
index 0eb2a144fc..70b669ee20 100644
--- a/macros/latex/contrib/caption/subcaption.dtx
+++ b/macros/latex/contrib/caption/subcaption.dtx
@@ -30,7 +30,7 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{subcaption.drv}[2019/08/31 v1.3 Adds a sub-caption feature to the caption package]
+\ProvidesFile{subcaption.drv}[2019/09/10 v1.3 Adds a sub-caption feature to the caption package]
\hbadness=9999 \newcount\hbadness \hfuzz=74pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -402,7 +402,7 @@
% \end{itemize}
%
% \NEWfeature{v1.2}
-% Beside the \meta{inner-pos} values of `c', `t', and `b', \thispackage\ also offers the
+% Beside the \meta{outer-pos} values of `c', `t', and `b', \thispackage\ also offers the
% values `T' and `B' additionally which align the |sub|\-|figure| at the
% very top resp.~bottom. (In contrast `t' and `b' align the |sub|\-|figure| at the
% top resp.~bottom \textit{baseline}.)
@@ -410,7 +410,7 @@
% \bigskip
%
% \begin{background}
-% The |subfigure| \& |subtable| environments are just simple minipage
+% The |subfigure| \& |subtable| environments are just simple |minipage|
% environments with |\set|\-|caption|\-|sub|\-|type| as first contents line.
% These environments are defined with the help of
% |\caption@For{subtypelist}|, which executes code for every sub-type
diff --git a/macros/latex/contrib/caption/subcaption.pdf b/macros/latex/contrib/caption/subcaption.pdf
index 70b4cde42d..8a4257ed5e 100644
--- a/macros/latex/contrib/caption/subcaption.pdf
+++ b/macros/latex/contrib/caption/subcaption.pdf
Binary files differ
diff --git a/macros/latex/contrib/epstopdf-pkg/README.md b/macros/latex/contrib/epstopdf-pkg/README.md
new file mode 100644
index 0000000000..20129fd094
--- /dev/null
+++ b/macros/latex/contrib/epstopdf-pkg/README.md
@@ -0,0 +1,20 @@
+# epstopdf
+epstopdf (and epstopdf-base) package for including EPS in pdftex and luatex
+
+
+## Note
+
+`epstopdf-base.sty` is included by the pdftex and luatex options for
+the core graphics package
+
+Separating epspdf to a separate repository is a first step in removing
+the dependency of the core package on the entire oberdiek bundle.
+
+Currently the dependency is still present due to
+
+
+ \RequirePackage{infwarerr}[2007/09/09]
+ \RequirePackage{grfext}\relax
+ \RequirePackage{kvoptions}[2007/10/02]
+ \RequirePackage{pdftexcmds}[2007/11/11]
+
diff --git a/macros/latex/contrib/oberdiek/epstopdf.dtx b/macros/latex/contrib/epstopdf-pkg/epstopdf.dtx
index be5938f44d..497fc5c4e7 100644
--- a/macros/latex/contrib/oberdiek/epstopdf.dtx
+++ b/macros/latex/contrib/epstopdf-pkg/epstopdf.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
%
% File: epstopdf.dtx
-% Version: 2016/05/15 v2.6
+% Version: 2019/11/24 v2.7
% Info: Conversion with epstopdf on the fly
%
-% Copyright (C) 2001, 2006-2010 by
-% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+% Copyright (C)
+% 2001, 2006-2010 Heiko Oberdiek
+% 2016-2019 Oberdiek Package Support Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -21,7 +22,7 @@
%
% The Current Maintainers of this work are
% Heiko Oberdiek and the Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% https://github.com/ho-tex/epstopdf/issues
%
% This work consists of the main source file epstopdf.dtx
% and the derived files
@@ -29,8 +30,8 @@
% epstopdf-base.sty, epstopdf-test1.tex.
%
% Distribution:
-% CTAN:macros/latex/contrib/oberdiek/epstopdf.dtx
-% CTAN:macros/latex/contrib/oberdiek/epstopdf.pdf
+% CTAN:macros/latex/contrib/epstopdf/epstopdf.dtx
+% CTAN:macros/latex/contrib/epstopdf/epstopdf.pdf
%
% Unpacking:
% (a) If epstopdf.ins is present:
@@ -59,11 +60,10 @@
% pdflatex epstopdf.dtx
%
% Installation:
-% TDS:tex/latex/oberdiek/epstopdf.sty
-% TDS:tex/latex/oberdiek/epstopdf-base.sty
-% TDS:doc/latex/oberdiek/epstopdf.pdf
-% TDS:doc/latex/oberdiek/test/epstopdf-test1.tex
-% TDS:source/latex/oberdiek/epstopdf.dtx
+% TDS:tex/latex/epstopdf/epstopdf.sty
+% TDS:tex/latex/epstopdf/epstopdf-base.sty
+% TDS:doc/latex/epstopdf/epstopdf.pdf
+% TDS:source/latex/epstopdf/epstopdf.dtx
%
%<*ignore>
\begingroup
@@ -80,7 +80,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: epstopdf 2016/05/15 v2.6 Conversion with epstopdf on the fly (HO)}
+\Msg{* Package: epstopdf 2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -92,10 +92,11 @@
This is a generated file.
Project: epstopdf
-Version: 2016/05/15 v2.6
+Version: 2019/11/24 v2.7
-Copyright (C) 2001, 2006-2010 by
- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+Copyright (C)
+ 2001, 2006-2010 Heiko Oberdiek
+ 2016-2019 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -125,14 +126,14 @@ and the derived files
\generate{%
\file{epstopdf.ins}{\from{epstopdf.dtx}{install}}%
\file{epstopdf.drv}{\from{epstopdf.dtx}{driver}}%
- \usedir{tex/latex/oberdiek}%
+ \usedir{tex/latex/epstopdf}%
\file{epstopdf.sty}{\from{epstopdf.dtx}{package}}%
\file{epstopdf-base.sty}{\from{epstopdf.dtx}{base}}%
-% \usedir{doc/latex/oberdiek/test}%
+% \usedir{doc/latex/epstopdf/test}%
% \file{epstopdf-test1.tex}{\from{epstopdf.dtx}{test1}}%
\nopreamble
\nopostamble
-% \usedir{source/latex/oberdiek/catalogue}%
+% \usedir{source/latex/epstopdf/catalogue}%
% \file{epstopdf-pkg.xml}{\from{epstopdf.dtx}{catalogue}}%
}
@@ -160,7 +161,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{epstopdf.drv}%
- [2016/05/15 v2.6 Conversion with epstopdf on the fly (HO)]%
+ [2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\begin{document}
@@ -189,9 +190,9 @@ and the derived files
% \GetFileInfo{epstopdf.drv}
%
% \title{The \xpackage{epstopdf} package}
-% \date{2016/05/15 v2.6}
+% \date{2019/11/24 v2.7}
% \author{Heiko Oberdiek\thanks
-% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
+% {Please report any issues at \url{https://github.com/ho-tex/epstopdf/issues}}}
%
% \maketitle
%
@@ -591,7 +592,7 @@ and the derived files
\fi
\expandafter\x\csname ver@epstopdf.sty\endcsname
\ProvidesPackage{epstopdf}%
- [2016/05/15 v2.6 Conversion with epstopdf on the fly (HO)]%
+ [2019/11/24 v2.7 Conversion with epstopdf on the fly (HO)]%
% \end{macrocode}
% Larger catcode set because of configuration files needed.
% \begin{macrocode}
@@ -640,7 +641,7 @@ and the derived files
%
% \begin{macrocode}
\let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2016/05/15]
+\RequirePackage{epstopdf-base}[2019/11/24]
\let\ETE@AtEnd\ETE@SavedAtEnd
% \end{macrocode}
%
@@ -739,7 +740,7 @@ and the derived files
\fi
\expandafter\x\csname ver@epstopdf-base.sty\endcsname
\ProvidesPackage{epstopdf-base}%
- [2016/05/15 v2.6 Base part for package epstopdf]%
+ [2019/11/24 v2.7 Base part for package epstopdf]%
% \end{macrocode}
%
% \subsubsection{Catcodes}
@@ -1314,19 +1315,19 @@ and the derived files
% \subsection{Download}
%
% \paragraph{Package.} This package is available on
-% CTAN\footnote{\CTANpkg{epstopdf}}:
+% CTAN\footnote{\CTANpkg{epstopdf-pkg}}:
% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/epstopdf.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/epstopdf.pdf}] Documentation.
+% \item[\CTAN{macros/latex/contrib/epstopdf/epstopdf.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/epstopdf/epstopdf.pdf}] Documentation.
% \end{description}
%
%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% \paragraph{Bundle.} All the packages of the bundle `epstopdf'
% are also available in a TDS compliant ZIP archive. There
% the packages are already unpacked and the documentation files
% are generated. The files and directories obey the TDS standard.
% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/epstopdf.tds.zip}]
% \end{description}
% \emph{TDS} refers to the standard ``A Directory Structure
% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1334,23 +1335,11 @@ and the derived files
%
% \subsection{Bundle installation}
%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
+% \paragraph{Unpacking.} Unpack the \xfile{epstopdf.tds.zip} in the
% TDS tree (also known as \xfile{texmf} tree) of your choice.
% Example (linux):
% \begin{quote}
-% |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
-% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% |unzip epstopdf.tds.zip -d ~/texmf|
% \end{quote}
%
% \subsection{Package installation}
@@ -1368,11 +1357,11 @@ and the derived files
% \begin{quote}
% \def\t{^^A
% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-% epstopdf.sty & tex/latex/oberdiek/epstopdf.sty\\
-% epstopdf-base.sty & tex/latex/oberdiek/epstopdf-base.sty\\
-% epstopdf.pdf & doc/latex/oberdiek/epstopdf.pdf\\
-% test/epstopdf-test1.tex & doc/latex/oberdiek/test/epstopdf-test1.tex\\
-% epstopdf.dtx & source/latex/oberdiek/epstopdf.dtx\\
+% epstopdf.sty & tex/latex/epstopdf/epstopdf.sty\\
+% epstopdf-base.sty & tex/latex/epstopdf/epstopdf-base.sty\\
+% epstopdf.pdf & doc/latex/epstopdf/epstopdf.pdf\\
+% test/epstopdf-test1.tex & doc/latex/epstopdf/test/epstopdf-test1.tex\\
+% epstopdf.dtx & source/latex/epstopdf/epstopdf.dtx\\
% \end{tabular}^^A
% }^^A
% \sbox0{\t}^^A
@@ -1594,6 +1583,10 @@ and the derived files
% \item
% luaTeX compatibility
% \end{Version}
+% \begin{Version}{2019/11/24 v2.7}
+% \item
+% New epstopdf repository.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/macros/latex/contrib/epstopdf-pkg/epstopdf.pdf b/macros/latex/contrib/epstopdf-pkg/epstopdf.pdf
new file mode 100644
index 0000000000..0602221929
--- /dev/null
+++ b/macros/latex/contrib/epstopdf-pkg/epstopdf.pdf
Binary files differ
diff --git a/macros/latex/contrib/footnoterange/README b/macros/latex/contrib/footnoterange/README
index 30812580a5..fb785c9428 100644
--- a/macros/latex/contrib/footnoterange/README
+++ b/macros/latex/contrib/footnoterange/README
@@ -1,4 +1,4 @@
-README for footnoterange package, 2018/10/15, v1.0b
+README for footnoterange package, 2019/11/24, v1.0c
TABLE OF CONTENTS
diff --git a/macros/latex/contrib/footnoterange/footnoterange-example.pdf b/macros/latex/contrib/footnoterange/footnoterange-example.pdf
index 75cd9a4f49..693449febb 100644
--- a/macros/latex/contrib/footnoterange/footnoterange-example.pdf
+++ b/macros/latex/contrib/footnoterange/footnoterange-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/footnoterange/footnoterange.dtx b/macros/latex/contrib/footnoterange/footnoterange.dtx
index 50432562ea..307cb9862e 100644
--- a/macros/latex/contrib/footnoterange/footnoterange.dtx
+++ b/macros/latex/contrib/footnoterange/footnoterange.dtx
@@ -1,9 +1,9 @@
% \iffalse meta-comment
%
% File: footnoterange.dtx
-% Version: 2018/10/15 v1.0b
+% Version: 2019/11/24 v1.0c
%
-% Copyright (C) 2012 - 2018 by
+% Copyright (C) 2012 - 2019 by
% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
% Portions of code copyrighted by other people as marked;
% lines marked "FMi": code by Frank Mittelbach, thanks!
@@ -85,7 +85,7 @@
\input docstrip.tex
\Msg{*********************************************************************************}
\Msg{* Installation}
-\Msg{* Package: footnoterange 2018/10/15 v1.0b References to ranges of footnotes (HMM)}
+\Msg{* Package: footnoterange 2019/11/24 v1.0c References to ranges of footnotes (HMM)}
\Msg{*********************************************************************************}
\keepsilent
@@ -97,9 +97,9 @@
This is a generated file.
Project: footnoterange
-Version: 2018/10/15 v1.0b
+Version: 2019/11/24 v1.0c
-Copyright (C) 2012 - 2018 by
+Copyright (C) 2012 - 2019 by
H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
Portions of code copyrighted by other people as marked;
lines marked "FMi": code by Frank Mittelbach, thanks!
@@ -188,7 +188,7 @@ In memoriam
% \begin{macrocode}
%<*driver>
\NeedsTeXFormat{LaTeX2e}[2015/01/01]
-\ProvidesFile{footnoterange.drv}[2018/10/15 v1.0b
+\ProvidesFile{footnoterange.drv}[2019/11/24 v1.0c
References to ranges of footnotes (HMM)]
\documentclass{ltxdoc}[2015/03/26]% v2.0w
\usepackage{holtxdoc}[2012/03/21]% v0.24
@@ -274,7 +274,7 @@ In memoriam
% \DoNotIndex{\arabic, \Alph, \alph, \alphalph, \Roman, \roman, \fnsymbol}
%
% \title{The \xpackage{footnoterange} package}
-% \date{2018/10/15 v1.0b}
+% \date{2019/11/24 v1.0c}
% \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
%
% \maketitle
@@ -305,7 +305,7 @@ In memoriam
% $2\unit{g}$ CO$_{2}$ and $2\unit{g}$ wood:
% Therefore please print only if this is really necessary.
%
-% \bigskip
+% \medskip
%
% \tableofcontents
%
@@ -435,7 +435,7 @@ In memoriam
hyperfootnotes=true%
]{hyperref}[2012/11/06]% v6.83m
-\usepackage{footnoterange}[2018/10/15]% v1.0b
+\usepackage{footnoterange}[2019/11/24]% v1.0c
\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
\listfiles
@@ -444,7 +444,7 @@ In memoriam
\section*{Example for footnoterange}
This example demonstrates the use of package\newline
-\textsf{footnoterange}, v1.0b as of 2018/10/15 (HMM).\newline
+\textsf{footnoterange}, v1.0c as of 2019/11/24 (HMM).\newline
The package does not use options.\newline
\verb|footnoterange-example.pdf| can be created by\newline
\verb|pdflatex footnoterange-example.tex|,\newline
@@ -538,7 +538,7 @@ are probably not very clear.
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{footnoterange}[2018/10/15 v1.0b
+\ProvidesPackage{footnoterange}[2019/11/24 v1.0c
References to ranges of footnotes (HMM)]
% \end{macrocode}
%
@@ -604,7 +604,7 @@ are probably not very clear.
% \begin{macrocode}
\xdef\fnr@opt{#1}% contains the optional argument
\xdef\fnr@arabic{\arabic\@mpfn}%
- \edef\fnr@formated{\thefootnote}%
+ \protected@edef\fnr@formated{\thefootnote}%
% \end{macrocode}
%
% The |\footnotemark| is not set (yet), but the |\footnotetext|,
@@ -881,7 +881,7 @@ are probably not very clear.
% \item[-] class \xpackage{article}, 2007/10/19, v1.4h, from \xpackage{classes.dtx}:\newline
% \url{https://www.ctan.org/tex-archive/macros/latex/base/}
%
-% \item[-] package \xpackage{footnoterange}, 2018/10/15, v1.0b,\newline
+% \item[-] package \xpackage{footnoterange}, 2019/11/24, v1.0c,\newline
% \url{https://www.ctan.org/pkg/footnoterange}\newline
% (Well, it is the example file for this package, and because you are
% reading the documentation for the \xpackage{footnoterange} package,
@@ -1088,21 +1088,22 @@ are probably not very clear.
% which I also got everything I know about creating a file in \xext{dtx}
% format, ok, say it: copying), \textsc{Frank Mittelbach} for several bug reports,
% for code for improving the package, and for pointing me to the \xpackage{fnpct}
-% package as alternative, everybody of the CTAN team for managing CTAN, and the
-% \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex}
-% newsgroups and everybody at \url{https://tex.stackexchange.com/}
+% package as alternative, Willie Wong for reporting a bug and its fix,
+% everybody of the CTAN team for managing CTAN,
+% the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex} newsgroups,
+% and everybody at \url{https://tex.stackexchange.com/}
% for their help in all things \hbox{\TeX{}.}
% This package was created as response to question
% \textquotedblleft Compressing consecutive footnote
% marks\textquotedblright{} by user001\newline
-% (\url{http://tex.stackexchange.com/users/10127/user001}) on\newline
-% \url{http://tex.stackexchange.com/q/44165/6865}.
+% (\url{https://tex.stackexchange.com/users/10127/user001}) on\newline
+% \url{https://tex.stackexchange.com/q/44165/6865}.
%
% \newpage
% \phantomsection
% \begin{History}\label{History}
% \begin{Version}{2011/02/11 v0.1ff.}
-% \item Some versions at \url{http://tex.stackexchange.com/q/44165/6865}.
+% \item Some versions at \url{https://tex.stackexchange.com/q/44165/6865}.
% \end{Version}
% \begin{Version}{2012/02/17 v1.0a}
% \item Package created and uploaded to CTAN.
@@ -1113,6 +1114,9 @@ are probably not very clear.
% \item Listing the \href{https://www.ctan.org/pkg/fnpct}{\xpackage{fnpct}}
% package as alternative.
% \end{Version}
+% \begin{Version}{2019/11/24 v1.0c}
+% \item Bug fix: Issue with footnote symbols.
+% \end{Version}
% \end{History}
%
% \bigskip
diff --git a/macros/latex/contrib/footnoterange/footnoterange.pdf b/macros/latex/contrib/footnoterange/footnoterange.pdf
index 06e83948ef..6cc3317374 100644
--- a/macros/latex/contrib/footnoterange/footnoterange.pdf
+++ b/macros/latex/contrib/footnoterange/footnoterange.pdf
Binary files differ
diff --git a/macros/latex/contrib/newfloat/CHANGELOG b/macros/latex/contrib/newfloat/CHANGELOG
new file mode 100644
index 0000000000..68e6585889
--- /dev/null
+++ b/macros/latex/contrib/newfloat/CHANGELOG
@@ -0,0 +1,13 @@
+Changes made in the newfloat package
+====================================
+
+Please note that this document does not reflect bugfix-releases, and that the dates given are the dates of the release w/o bugfixes.
+
+If you are interested in a complete changelog -- including bugfixes -- process the dtx files with \RecordChanges and \PrintChanges.
+
+v1.0 (2011/10/30)
+- 1st published version
+
+v1.1 (2013/04/27)
+- New command \PrepareListOf
+
diff --git a/macros/latex/contrib/newfloat/README b/macros/latex/contrib/newfloat/README
new file mode 100644
index 0000000000..5d5ce91248
--- /dev/null
+++ b/macros/latex/contrib/newfloat/README
@@ -0,0 +1,38 @@
+==========================================================================
+
+The `newfloat' package
+Copyright (C) 2011-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+
+License: LPPL = LaTeX Project Public Licence
+Maintenance Status: maintained (by Axel Sommerfeldt)
+
+Home page:
+ https://gitlab.com/axelsommerfeldt/newfloat
+
+If you need help for installation please visit:
+ https://texfaq.org/FAQ-inst-miktexstar
+ https://texfaq.org/FAQ-installthings
+ https://texfaq.org/FAQ-privinst
+
+If you need help using these packages please visit:
+ https://latex.org/forum/
+ https://tex.stackexchange.com/
+ https://golatex.de/ (German)
+ https://texwelt.de/ (German)
+
+If you think you may have found a bug in these packages,
+or want to report a suggestion for improvement, please either visit
+ https://gitlab.com/axelsommerfeldt/newfloat/issues (preferred)
+or send an e-mail to
+ axel.sommerfeldt@f-m.fm
+
+--------------------------------------------------------------------------
+
+The `newfloat' package v1.1 offers the command \DeclareFloatingEnvironment
+for defining new floating environments which behave like the existing
+floating environments "figure" and "table".
+
+User Manual: newfloat.pdf (English)
+
+==========================================================================
+
diff --git a/macros/latex/contrib/newfloat/SUMMARY b/macros/latex/contrib/newfloat/SUMMARY
new file mode 100644
index 0000000000..21d118cffc
--- /dev/null
+++ b/macros/latex/contrib/newfloat/SUMMARY
@@ -0,0 +1 @@
+This LaTeX package offers the command \DeclareFloatingEnvironment for defining new floating environments which behave like the existing floating environments "figure" and "table".
diff --git a/macros/latex/contrib/caption/newfloat.dtx b/macros/latex/contrib/newfloat/newfloat.dtx
index 71484e60bc..eed00a0f96 100644
--- a/macros/latex/contrib/caption/newfloat.dtx
+++ b/macros/latex/contrib/newfloat/newfloat.dtx
@@ -18,14 +18,11 @@
%
% This Current Maintainer of this work is Axel Sommerfeldt.
%
-% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
-% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx,
-% the derived files caption.sty, caption2.sty, caption3.sty,
-% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
-% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+% This work consists of the files newfloat.ins, newfloat.dtx,
+% and the derived file newfloat.sty.
%
% \fi
-% \CheckSum{1605}
+% \CheckSum{1609}
%
% \iffalse
%<*driver>
@@ -95,7 +92,7 @@
% This package has version number \docversion.}}%^^A
% {The newfloat package}}
% \author{Axel Sommerfeldt\\
-% \url{https://gitlab.com/axelsommerfeldt/caption}}
+% \url{https://gitlab.com/axelsommerfeldt/newfloat}}
% \date{\docdate}
% \maketitle
%
@@ -533,7 +530,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{newfloat}[2019/09/01 v1.1k Defining new floating environments (AR)]
+\ProvidesPackage{newfloat}[2019/09/02 v1.1l Defining new floating environments (AR)]
% \end{macrocode}
%
% \begin{macro}{\newfloat@Info}
@@ -1989,14 +1986,19 @@
%
% If the \package{float} package is used we fill up |\float@exts| with our file
% extensions, too. Since this list will be used for inserting chapters gaps
-% we only add the ones which are configured for chapters gaps on.
-% \begin{macrocode}
-\newfloat@IfPackageLoaded{float}{newfloat@undefined}{%
- \@nameuse{@ifchapterlistsgap@#1}{% if switched on
- \let\float@do=\relax
- \edef\@tempa{%
- \noexpand\float@exts{\the\float@exts\float@do{\@nameuse{ext@#1}}}}%
- \@tempa}}
+% we only add the ones which are configured for chapters gaps on.\par
+% Note: This has to be done |\At|\-|Begin|\-|Document| so the settings for
+% chapter gaps could be changed by the user within the preamble of the document.
+% \begin{macrocode}
+\AtBeginDocument{%
+ \ifcsname float@exts\endcsname
+ \newfloat@@IfPackageLoaded{float}{newfloat@undefined}{%
+ \@nameuse{@ifchapterlistsgap@#1}{% if switched on
+ \let\float@do=\relax
+ \edef\@tempa{%
+ \noexpand\float@exts{\the\float@exts\float@do{\@nameuse{ext@#1}}}}%
+ \@tempa}}%
+ \fi}
% \end{macrocode}
%
% \pagebreak[3]
diff --git a/macros/latex/contrib/newfloat/newfloat.ins b/macros/latex/contrib/newfloat/newfloat.ins
new file mode 100644
index 0000000000..889504d534
--- /dev/null
+++ b/macros/latex/contrib/newfloat/newfloat.ins
@@ -0,0 +1,42 @@
+\def\batchfile{newfloat.ins}
+\input docstrip
+
+\askforoverwritefalse
+\keepsilent
+
+\preamble
+
+Copyright (C) 2011-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+
+https://gitlab.com/axelsommerfeldt/newfloat
+
+--------------------------------------------------------------------------
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2003/12/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+
+This Current Maintainer of this work is Axel Sommerfeldt.
+
+This work consists of the files newfloat.ins, newfloat.dtx,
+and the derived file newfloat.sty.
+
+\endpreamble
+
+\generate{\file{newfloat.sty}{\from{newfloat.dtx}{package}}}
+
+\Msg{***********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the file}
+\Msg{* `newfloat.sty' into a directory searched by TeX.}
+\Msg{*}
+\Msg{* To produce the documentation run the file}
+\Msg{* `newfloat.dtx' through LaTeX.}
+\Msg{*}
+\Msg{***********************************************************}
diff --git a/macros/latex/contrib/caption/newfloat.pdf b/macros/latex/contrib/newfloat/newfloat.pdf
index 597f044f51..0300dfdec8 100644
--- a/macros/latex/contrib/caption/newfloat.pdf
+++ b/macros/latex/contrib/newfloat/newfloat.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/README.txt b/macros/latex/contrib/oberdiek/README.txt
index 978bccd476..b1526c4308 100644
--- a/macros/latex/contrib/oberdiek/README.txt
+++ b/macros/latex/contrib/oberdiek/README.txt
@@ -1,4 +1,4 @@
-README 2019/11/12
+README 2019/11/24
This file describes the directory
CTAN:macros/latex/contrib/oberdiek/
@@ -12,10 +12,6 @@ Just download
CTAN:install/macros/latex/contrib/oberdiek.tds.zip
and unzip it in your preferred TDS (texmf) tree.
-Hint for attachfile2: This package comes with a Perl script pdfatfi.pl
-that should be installed somewhere in PATH as `pdfatfi', see also
-package documentation.
-
Other files in the CTAN directory:
* README: This file.
diff --git a/macros/latex/contrib/oberdiek/accsupp.dtx b/macros/latex/contrib/oberdiek/accsupp.dtx
index 981873bce2..c615aa5944 100644
--- a/macros/latex/contrib/oberdiek/accsupp.dtx
+++ b/macros/latex/contrib/oberdiek/accsupp.dtx
@@ -991,14 +991,6 @@ ed as
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/accsupp.pdf b/macros/latex/contrib/oberdiek/accsupp.pdf
index 6f4ded0698..f6c729b350 100644
--- a/macros/latex/contrib/oberdiek/accsupp.pdf
+++ b/macros/latex/contrib/oberdiek/accsupp.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/aliascnt.dtx b/macros/latex/contrib/oberdiek/aliascnt.dtx
index fa0504ab83..dc3e8d4081 100644
--- a/macros/latex/contrib/oberdiek/aliascnt.dtx
+++ b/macros/latex/contrib/oberdiek/aliascnt.dtx
@@ -407,14 +407,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/aliascnt.pdf b/macros/latex/contrib/oberdiek/aliascnt.pdf
index ceba0f2071..779f5a4c2d 100644
--- a/macros/latex/contrib/oberdiek/aliascnt.pdf
+++ b/macros/latex/contrib/oberdiek/aliascnt.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/alphalph.dtx b/macros/latex/contrib/oberdiek/alphalph.dtx
index 42d9f00288..98c506a3c2 100644
--- a/macros/latex/contrib/oberdiek/alphalph.dtx
+++ b/macros/latex/contrib/oberdiek/alphalph.dtx
@@ -1684,14 +1684,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/alphalph.pdf b/macros/latex/contrib/oberdiek/alphalph.pdf
index 260650f030..28a908b8c1 100644
--- a/macros/latex/contrib/oberdiek/alphalph.pdf
+++ b/macros/latex/contrib/oberdiek/alphalph.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/askinclude.dtx b/macros/latex/contrib/oberdiek/askinclude.dtx
index eb335f0936..1e28340f58 100644
--- a/macros/latex/contrib/oberdiek/askinclude.dtx
+++ b/macros/latex/contrib/oberdiek/askinclude.dtx
@@ -2694,14 +2694,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/askinclude.pdf b/macros/latex/contrib/oberdiek/askinclude.pdf
index ba2c3aaaea..092af562b6 100644
--- a/macros/latex/contrib/oberdiek/askinclude.pdf
+++ b/macros/latex/contrib/oberdiek/askinclude.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/atbegshi.dtx b/macros/latex/contrib/oberdiek/atbegshi.dtx
index 472a25ebdc..27659be45a 100644
--- a/macros/latex/contrib/oberdiek/atbegshi.dtx
+++ b/macros/latex/contrib/oberdiek/atbegshi.dtx
@@ -2165,14 +2165,6 @@ Hello World
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/atbegshi.pdf b/macros/latex/contrib/oberdiek/atbegshi.pdf
index 67176c62b7..2f3af47ee6 100644
--- a/macros/latex/contrib/oberdiek/atbegshi.pdf
+++ b/macros/latex/contrib/oberdiek/atbegshi.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/atenddvi.dtx b/macros/latex/contrib/oberdiek/atenddvi.dtx
index 3632f221f0..7f4adc689c 100644
--- a/macros/latex/contrib/oberdiek/atenddvi.dtx
+++ b/macros/latex/contrib/oberdiek/atenddvi.dtx
@@ -423,14 +423,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/atenddvi.pdf b/macros/latex/contrib/oberdiek/atenddvi.pdf
index c0a3a54a89..f3899ce414 100644
--- a/macros/latex/contrib/oberdiek/atenddvi.pdf
+++ b/macros/latex/contrib/oberdiek/atenddvi.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/attachfile2.pdf b/macros/latex/contrib/oberdiek/attachfile2.pdf
deleted file mode 100644
index 1b8e6b30b3..0000000000
--- a/macros/latex/contrib/oberdiek/attachfile2.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/atveryend.dtx b/macros/latex/contrib/oberdiek/atveryend.dtx
index 0c47c7950e..00a9fe9808 100644
--- a/macros/latex/contrib/oberdiek/atveryend.dtx
+++ b/macros/latex/contrib/oberdiek/atveryend.dtx
@@ -1332,14 +1332,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/atveryend.pdf b/macros/latex/contrib/oberdiek/atveryend.pdf
index e9b4f26623..5175f2cb22 100644
--- a/macros/latex/contrib/oberdiek/atveryend.pdf
+++ b/macros/latex/contrib/oberdiek/atveryend.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/auxhook.dtx b/macros/latex/contrib/oberdiek/auxhook.dtx
index 37a1dc4aab..206f3f2675 100644
--- a/macros/latex/contrib/oberdiek/auxhook.dtx
+++ b/macros/latex/contrib/oberdiek/auxhook.dtx
@@ -451,14 +451,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/auxhook.pdf b/macros/latex/contrib/oberdiek/auxhook.pdf
index 87d7ba7ed2..13d218773a 100644
--- a/macros/latex/contrib/oberdiek/auxhook.pdf
+++ b/macros/latex/contrib/oberdiek/auxhook.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/bigintcalc.dtx b/macros/latex/contrib/oberdiek/bigintcalc.dtx
index dbe43326ce..78156448dd 100644
--- a/macros/latex/contrib/oberdiek/bigintcalc.dtx
+++ b/macros/latex/contrib/oberdiek/bigintcalc.dtx
@@ -4354,14 +4354,6 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/bigintcalc.pdf b/macros/latex/contrib/oberdiek/bigintcalc.pdf
index 9697f34014..314ab812e5 100644
--- a/macros/latex/contrib/oberdiek/bigintcalc.pdf
+++ b/macros/latex/contrib/oberdiek/bigintcalc.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/bitset.dtx b/macros/latex/contrib/oberdiek/bitset.dtx
index cfb470b749..9b810c7104 100644
--- a/macros/latex/contrib/oberdiek/bitset.dtx
+++ b/macros/latex/contrib/oberdiek/bitset.dtx
@@ -4049,14 +4049,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/bitset.pdf b/macros/latex/contrib/oberdiek/bitset.pdf
index 9417a95cc0..78e84ad24a 100644
--- a/macros/latex/contrib/oberdiek/bitset.pdf
+++ b/macros/latex/contrib/oberdiek/bitset.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/bmpsize.dtx b/macros/latex/contrib/oberdiek/bmpsize.dtx
index 6dc71d1a25..256379b43a 100644
--- a/macros/latex/contrib/oberdiek/bmpsize.dtx
+++ b/macros/latex/contrib/oberdiek/bmpsize.dtx
@@ -3776,14 +3776,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/bmpsize.pdf b/macros/latex/contrib/oberdiek/bmpsize.pdf
index 9f4ba7a9b4..e8dc87c32b 100644
--- a/macros/latex/contrib/oberdiek/bmpsize.pdf
+++ b/macros/latex/contrib/oberdiek/bmpsize.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/bookmark.dtx b/macros/latex/contrib/oberdiek/bookmark.dtx
index 021ff10c4d..79f0fad2b8 100644
--- a/macros/latex/contrib/oberdiek/bookmark.dtx
+++ b/macros/latex/contrib/oberdiek/bookmark.dtx
@@ -3113,14 +3113,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/bookmark.pdf b/macros/latex/contrib/oberdiek/bookmark.pdf
index 39d08ee548..4564879759 100644
--- a/macros/latex/contrib/oberdiek/bookmark.pdf
+++ b/macros/latex/contrib/oberdiek/bookmark.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/catchfile.dtx b/macros/latex/contrib/oberdiek/catchfile.dtx
index 86bbfc2d83..019eb4776a 100644
--- a/macros/latex/contrib/oberdiek/catchfile.dtx
+++ b/macros/latex/contrib/oberdiek/catchfile.dtx
@@ -924,14 +924,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/catchfile.pdf b/macros/latex/contrib/oberdiek/catchfile.pdf
index 83906d4a7e..1d012ce838 100644
--- a/macros/latex/contrib/oberdiek/catchfile.pdf
+++ b/macros/latex/contrib/oberdiek/catchfile.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/centernot.dtx b/macros/latex/contrib/oberdiek/centernot.dtx
index 44cefabee2..4ef3fda03f 100644
--- a/macros/latex/contrib/oberdiek/centernot.dtx
+++ b/macros/latex/contrib/oberdiek/centernot.dtx
@@ -364,14 +364,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/centernot.pdf b/macros/latex/contrib/oberdiek/centernot.pdf
index 02f00e47c7..c07a5f8fd9 100644
--- a/macros/latex/contrib/oberdiek/centernot.pdf
+++ b/macros/latex/contrib/oberdiek/centernot.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/chemarr.dtx b/macros/latex/contrib/oberdiek/chemarr.dtx
index 13f584a7b8..6e37198ed9 100644
--- a/macros/latex/contrib/oberdiek/chemarr.dtx
+++ b/macros/latex/contrib/oberdiek/chemarr.dtx
@@ -359,14 +359,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/chemarr.pdf b/macros/latex/contrib/oberdiek/chemarr.pdf
index fd5924f8e2..30a3c37a0f 100644
--- a/macros/latex/contrib/oberdiek/chemarr.pdf
+++ b/macros/latex/contrib/oberdiek/chemarr.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/classlist.dtx b/macros/latex/contrib/oberdiek/classlist.dtx
index cc2e65b46b..7d15bd431d 100644
--- a/macros/latex/contrib/oberdiek/classlist.dtx
+++ b/macros/latex/contrib/oberdiek/classlist.dtx
@@ -448,14 +448,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/classlist.pdf b/macros/latex/contrib/oberdiek/classlist.pdf
index 1f1510104f..d82cedc6e8 100644
--- a/macros/latex/contrib/oberdiek/classlist.pdf
+++ b/macros/latex/contrib/oberdiek/classlist.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/colonequals.dtx b/macros/latex/contrib/oberdiek/colonequals.dtx
index 53ceae893c..9506db5480 100644
--- a/macros/latex/contrib/oberdiek/colonequals.dtx
+++ b/macros/latex/contrib/oberdiek/colonequals.dtx
@@ -472,14 +472,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/colonequals.pdf b/macros/latex/contrib/oberdiek/colonequals.pdf
index b07e4758c8..59bd704097 100644
--- a/macros/latex/contrib/oberdiek/colonequals.pdf
+++ b/macros/latex/contrib/oberdiek/colonequals.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/dvipscol.dtx b/macros/latex/contrib/oberdiek/dvipscol.dtx
index 22f9555e7d..96ad58bcc1 100644
--- a/macros/latex/contrib/oberdiek/dvipscol.dtx
+++ b/macros/latex/contrib/oberdiek/dvipscol.dtx
@@ -357,14 +357,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/dvipscol.pdf b/macros/latex/contrib/oberdiek/dvipscol.pdf
index f228486395..dcdebac9f4 100644
--- a/macros/latex/contrib/oberdiek/dvipscol.pdf
+++ b/macros/latex/contrib/oberdiek/dvipscol.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/embedfile.dtx b/macros/latex/contrib/oberdiek/embedfile.dtx
index 6d4d2a0042..344ff89b8e 100644
--- a/macros/latex/contrib/oberdiek/embedfile.dtx
+++ b/macros/latex/contrib/oberdiek/embedfile.dtx
@@ -1904,14 +1904,6 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
@@ -2056,7 +2048,7 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
% \bibitem{attachfile2}
% Heiko Oberdiek: \textit{The \xpackage{attachfile2} package};
% 2006/08/16 v2.2;
-% \CTAN{macros/latex/contrib/oberdiek/attachfile2.pdf}.
+% \CTAN{macros/latex/contrib/attachfile2/attachfile2.pdf}.
%
% \bibitem{pdfspec}
% Adobe Systems Incorporated:
diff --git a/macros/latex/contrib/oberdiek/embedfile.pdf b/macros/latex/contrib/oberdiek/embedfile.pdf
index 9276b50ef2..15832c100f 100644
--- a/macros/latex/contrib/oberdiek/embedfile.pdf
+++ b/macros/latex/contrib/oberdiek/embedfile.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/engord.dtx b/macros/latex/contrib/oberdiek/engord.dtx
index 335c147520..2a81c3a3e2 100644
--- a/macros/latex/contrib/oberdiek/engord.dtx
+++ b/macros/latex/contrib/oberdiek/engord.dtx
@@ -800,14 +800,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/engord.pdf b/macros/latex/contrib/oberdiek/engord.pdf
index c3aaa41896..a5ec829fff 100644
--- a/macros/latex/contrib/oberdiek/engord.pdf
+++ b/macros/latex/contrib/oberdiek/engord.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/enparen.dtx b/macros/latex/contrib/oberdiek/enparen.dtx
index 1bad972131..5a8b66efd3 100644
--- a/macros/latex/contrib/oberdiek/enparen.dtx
+++ b/macros/latex/contrib/oberdiek/enparen.dtx
@@ -818,14 +818,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/enparen.pdf b/macros/latex/contrib/oberdiek/enparen.pdf
index ce913c04ea..7614eaccd0 100644
--- a/macros/latex/contrib/oberdiek/enparen.pdf
+++ b/macros/latex/contrib/oberdiek/enparen.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/eolgrab.dtx b/macros/latex/contrib/oberdiek/eolgrab.dtx
index 8862ed738c..433219f435 100644
--- a/macros/latex/contrib/oberdiek/eolgrab.dtx
+++ b/macros/latex/contrib/oberdiek/eolgrab.dtx
@@ -867,14 +867,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/eolgrab.pdf b/macros/latex/contrib/oberdiek/eolgrab.pdf
index 368ccd0435..aee278d71d 100644
--- a/macros/latex/contrib/oberdiek/eolgrab.pdf
+++ b/macros/latex/contrib/oberdiek/eolgrab.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/epstopdf.pdf b/macros/latex/contrib/oberdiek/epstopdf.pdf
deleted file mode 100644
index 2245631c92..0000000000
--- a/macros/latex/contrib/oberdiek/epstopdf.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/etexcmds.dtx b/macros/latex/contrib/oberdiek/etexcmds.dtx
index b34e4d9891..ccbc050951 100644
--- a/macros/latex/contrib/oberdiek/etexcmds.dtx
+++ b/macros/latex/contrib/oberdiek/etexcmds.dtx
@@ -762,14 +762,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/etexcmds.pdf b/macros/latex/contrib/oberdiek/etexcmds.pdf
index 66cb7f202a..e3d8d2698d 100644
--- a/macros/latex/contrib/oberdiek/etexcmds.pdf
+++ b/macros/latex/contrib/oberdiek/etexcmds.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/fibnum.dtx b/macros/latex/contrib/oberdiek/fibnum.dtx
index 5fb29a91f2..2da9127410 100644
--- a/macros/latex/contrib/oberdiek/fibnum.dtx
+++ b/macros/latex/contrib/oberdiek/fibnum.dtx
@@ -1014,14 +1014,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/fibnum.pdf b/macros/latex/contrib/oberdiek/fibnum.pdf
index 2daaba8c3a..7bed8c0826 100644
--- a/macros/latex/contrib/oberdiek/fibnum.pdf
+++ b/macros/latex/contrib/oberdiek/fibnum.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/flags.dtx b/macros/latex/contrib/oberdiek/flags.dtx
index 2de01a65a0..0be6f023d7 100644
--- a/macros/latex/contrib/oberdiek/flags.dtx
+++ b/macros/latex/contrib/oberdiek/flags.dtx
@@ -507,14 +507,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/flags.pdf b/macros/latex/contrib/oberdiek/flags.pdf
index 4d68750740..b974adc59f 100644
--- a/macros/latex/contrib/oberdiek/flags.pdf
+++ b/macros/latex/contrib/oberdiek/flags.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/gettitlestring.dtx b/macros/latex/contrib/oberdiek/gettitlestring.dtx
index a99f0af4ee..7af4516a66 100644
--- a/macros/latex/contrib/oberdiek/gettitlestring.dtx
+++ b/macros/latex/contrib/oberdiek/gettitlestring.dtx
@@ -801,14 +801,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/gettitlestring.pdf b/macros/latex/contrib/oberdiek/gettitlestring.pdf
index c750737b38..3037ca2109 100644
--- a/macros/latex/contrib/oberdiek/gettitlestring.pdf
+++ b/macros/latex/contrib/oberdiek/gettitlestring.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/grfext.dtx b/macros/latex/contrib/oberdiek/grfext.dtx
index 8ebd84fa4a..f0f2910e83 100644
--- a/macros/latex/contrib/oberdiek/grfext.dtx
+++ b/macros/latex/contrib/oberdiek/grfext.dtx
@@ -972,14 +972,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/grfext.pdf b/macros/latex/contrib/oberdiek/grfext.pdf
index f756c2bce0..26b796e92a 100644
--- a/macros/latex/contrib/oberdiek/grfext.pdf
+++ b/macros/latex/contrib/oberdiek/grfext.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hologo.dtx b/macros/latex/contrib/oberdiek/hologo.dtx
index 8b3d38914e..8d4e216205 100644
--- a/macros/latex/contrib/oberdiek/hologo.dtx
+++ b/macros/latex/contrib/oberdiek/hologo.dtx
@@ -4732,14 +4732,6 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hologo.pdf b/macros/latex/contrib/oberdiek/hologo.pdf
index a5ff0a727b..8ce9820d88 100644
--- a/macros/latex/contrib/oberdiek/hologo.pdf
+++ b/macros/latex/contrib/oberdiek/hologo.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/holtxdoc.dtx b/macros/latex/contrib/oberdiek/holtxdoc.dtx
index 62debb1dae..b08f46f77d 100644
--- a/macros/latex/contrib/oberdiek/holtxdoc.dtx
+++ b/macros/latex/contrib/oberdiek/holtxdoc.dtx
@@ -580,14 +580,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/holtxdoc.pdf b/macros/latex/contrib/oberdiek/holtxdoc.pdf
index ecd091880c..64d0578a3f 100644
--- a/macros/latex/contrib/oberdiek/holtxdoc.pdf
+++ b/macros/latex/contrib/oberdiek/holtxdoc.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hopatch.dtx b/macros/latex/contrib/oberdiek/hopatch.dtx
index 259be51436..8782afcdf8 100644
--- a/macros/latex/contrib/oberdiek/hopatch.dtx
+++ b/macros/latex/contrib/oberdiek/hopatch.dtx
@@ -720,14 +720,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hopatch.pdf b/macros/latex/contrib/oberdiek/hopatch.pdf
index 614aa20e65..cfca55a7ea 100644
--- a/macros/latex/contrib/oberdiek/hopatch.pdf
+++ b/macros/latex/contrib/oberdiek/hopatch.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hycolor.dtx b/macros/latex/contrib/oberdiek/hycolor.dtx
index 85f2903936..5370ed03c4 100644
--- a/macros/latex/contrib/oberdiek/hycolor.dtx
+++ b/macros/latex/contrib/oberdiek/hycolor.dtx
@@ -1996,14 +1996,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hycolor.pdf b/macros/latex/contrib/oberdiek/hycolor.pdf
index 65bd09f63f..67bd050df9 100644
--- a/macros/latex/contrib/oberdiek/hycolor.pdf
+++ b/macros/latex/contrib/oberdiek/hycolor.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hypbmsec.dtx b/macros/latex/contrib/oberdiek/hypbmsec.dtx
index 60a716fca8..e90890d3bb 100644
--- a/macros/latex/contrib/oberdiek/hypbmsec.dtx
+++ b/macros/latex/contrib/oberdiek/hypbmsec.dtx
@@ -634,14 +634,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hypbmsec.pdf b/macros/latex/contrib/oberdiek/hypbmsec.pdf
index e3d7743e3c..ef23aa4c87 100644
--- a/macros/latex/contrib/oberdiek/hypbmsec.pdf
+++ b/macros/latex/contrib/oberdiek/hypbmsec.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hypcap.dtx b/macros/latex/contrib/oberdiek/hypcap.dtx
index 9ef57eb82e..2a51a21d74 100644
--- a/macros/latex/contrib/oberdiek/hypcap.dtx
+++ b/macros/latex/contrib/oberdiek/hypcap.dtx
@@ -543,14 +543,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hypcap.pdf b/macros/latex/contrib/oberdiek/hypcap.pdf
index eb0ee6e7af..b90dd42fd1 100644
--- a/macros/latex/contrib/oberdiek/hypcap.pdf
+++ b/macros/latex/contrib/oberdiek/hypcap.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hypdestopt.dtx b/macros/latex/contrib/oberdiek/hypdestopt.dtx
index b8c9a76df0..e0d604d69a 100644
--- a/macros/latex/contrib/oberdiek/hypdestopt.dtx
+++ b/macros/latex/contrib/oberdiek/hypdestopt.dtx
@@ -798,14 +798,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hypdestopt.pdf b/macros/latex/contrib/oberdiek/hypdestopt.pdf
index 8c5809d295..a2f929825c 100644
--- a/macros/latex/contrib/oberdiek/hypdestopt.pdf
+++ b/macros/latex/contrib/oberdiek/hypdestopt.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hypdoc.dtx b/macros/latex/contrib/oberdiek/hypdoc.dtx
index 7d37511812..b185b416b2 100644
--- a/macros/latex/contrib/oberdiek/hypdoc.dtx
+++ b/macros/latex/contrib/oberdiek/hypdoc.dtx
@@ -1179,14 +1179,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hypdoc.pdf b/macros/latex/contrib/oberdiek/hypdoc.pdf
index 9cbdc090c4..c37c6938b2 100644
--- a/macros/latex/contrib/oberdiek/hypdoc.pdf
+++ b/macros/latex/contrib/oberdiek/hypdoc.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hypgotoe.dtx b/macros/latex/contrib/oberdiek/hypgotoe.dtx
index ecf5b50782..ec03d08f3b 100644
--- a/macros/latex/contrib/oberdiek/hypgotoe.dtx
+++ b/macros/latex/contrib/oberdiek/hypgotoe.dtx
@@ -522,14 +522,6 @@ Anker foobar is here.
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hypgotoe.pdf b/macros/latex/contrib/oberdiek/hypgotoe.pdf
index 39b5f67c81..891b138e51 100644
--- a/macros/latex/contrib/oberdiek/hypgotoe.pdf
+++ b/macros/latex/contrib/oberdiek/hypgotoe.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/hyphsubst.dtx b/macros/latex/contrib/oberdiek/hyphsubst.dtx
index 50e8de4636..1d16f8347e 100644
--- a/macros/latex/contrib/oberdiek/hyphsubst.dtx
+++ b/macros/latex/contrib/oberdiek/hyphsubst.dtx
@@ -763,14 +763,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/hyphsubst.pdf b/macros/latex/contrib/oberdiek/hyphsubst.pdf
index adcaaea2e5..4221328b6f 100644
--- a/macros/latex/contrib/oberdiek/hyphsubst.pdf
+++ b/macros/latex/contrib/oberdiek/hyphsubst.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/ifdraft.dtx b/macros/latex/contrib/oberdiek/ifdraft.dtx
index fb5e0a22bb..6f4346cc3e 100644
--- a/macros/latex/contrib/oberdiek/ifdraft.dtx
+++ b/macros/latex/contrib/oberdiek/ifdraft.dtx
@@ -371,14 +371,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/ifdraft.pdf b/macros/latex/contrib/oberdiek/ifdraft.pdf
index 61b4f95bd5..1778fe4fab 100644
--- a/macros/latex/contrib/oberdiek/ifdraft.pdf
+++ b/macros/latex/contrib/oberdiek/ifdraft.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/iflang.dtx b/macros/latex/contrib/oberdiek/iflang.dtx
index f5d1303239..608411678f 100644
--- a/macros/latex/contrib/oberdiek/iflang.dtx
+++ b/macros/latex/contrib/oberdiek/iflang.dtx
@@ -1023,14 +1023,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/iflang.pdf b/macros/latex/contrib/oberdiek/iflang.pdf
index 5a903f19f4..3edc46a927 100644
--- a/macros/latex/contrib/oberdiek/iflang.pdf
+++ b/macros/latex/contrib/oberdiek/iflang.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/infwarerr.dtx b/macros/latex/contrib/oberdiek/infwarerr.dtx
index 89003edc2c..e95d9733d6 100644
--- a/macros/latex/contrib/oberdiek/infwarerr.dtx
+++ b/macros/latex/contrib/oberdiek/infwarerr.dtx
@@ -1036,14 +1036,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/infwarerr.pdf b/macros/latex/contrib/oberdiek/infwarerr.pdf
index 1d196229aa..2c8fabc81c 100644
--- a/macros/latex/contrib/oberdiek/infwarerr.pdf
+++ b/macros/latex/contrib/oberdiek/infwarerr.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/inputenx.dtx b/macros/latex/contrib/oberdiek/inputenx.dtx
index 25688526bb..cab72230e5 100644
--- a/macros/latex/contrib/oberdiek/inputenx.dtx
+++ b/macros/latex/contrib/oberdiek/inputenx.dtx
@@ -11788,14 +11788,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/inputenx.pdf b/macros/latex/contrib/oberdiek/inputenx.pdf
index b203bf17d6..3a0c1ed620 100644
--- a/macros/latex/contrib/oberdiek/inputenx.pdf
+++ b/macros/latex/contrib/oberdiek/inputenx.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/intcalc.dtx b/macros/latex/contrib/oberdiek/intcalc.dtx
index d52390fa74..226b69c92d 100644
--- a/macros/latex/contrib/oberdiek/intcalc.dtx
+++ b/macros/latex/contrib/oberdiek/intcalc.dtx
@@ -4101,14 +4101,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/intcalc.pdf b/macros/latex/contrib/oberdiek/intcalc.pdf
index 69eb837905..be6415bced 100644
--- a/macros/latex/contrib/oberdiek/intcalc.pdf
+++ b/macros/latex/contrib/oberdiek/intcalc.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/kvdefinekeys.dtx b/macros/latex/contrib/oberdiek/kvdefinekeys.dtx
index 67ebac712d..2019ccc720 100644
--- a/macros/latex/contrib/oberdiek/kvdefinekeys.dtx
+++ b/macros/latex/contrib/oberdiek/kvdefinekeys.dtx
@@ -573,14 +573,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/kvdefinekeys.pdf b/macros/latex/contrib/oberdiek/kvdefinekeys.pdf
index 51e4ac2df5..74e04e6613 100644
--- a/macros/latex/contrib/oberdiek/kvdefinekeys.pdf
+++ b/macros/latex/contrib/oberdiek/kvdefinekeys.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/kvoptions.dtx b/macros/latex/contrib/oberdiek/kvoptions.dtx
index 54e188aed2..f79bbc0909 100644
--- a/macros/latex/contrib/oberdiek/kvoptions.dtx
+++ b/macros/latex/contrib/oberdiek/kvoptions.dtx
@@ -3075,14 +3075,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/kvoptions.pdf b/macros/latex/contrib/oberdiek/kvoptions.pdf
index c4dea083e3..26adcf06c9 100644
--- a/macros/latex/contrib/oberdiek/kvoptions.pdf
+++ b/macros/latex/contrib/oberdiek/kvoptions.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/kvsetkeys.dtx b/macros/latex/contrib/oberdiek/kvsetkeys.dtx
index a467e2e8fb..9d6db6682f 100644
--- a/macros/latex/contrib/oberdiek/kvsetkeys.dtx
+++ b/macros/latex/contrib/oberdiek/kvsetkeys.dtx
@@ -1893,14 +1893,6 @@ $ \x
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/kvsetkeys.pdf b/macros/latex/contrib/oberdiek/kvsetkeys.pdf
index 2a9dfc7751..feb64634fd 100644
--- a/macros/latex/contrib/oberdiek/kvsetkeys.pdf
+++ b/macros/latex/contrib/oberdiek/kvsetkeys.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/letltxmacro.dtx b/macros/latex/contrib/oberdiek/letltxmacro.dtx
index 8b0440d361..4e230dca0d 100644
--- a/macros/latex/contrib/oberdiek/letltxmacro.dtx
+++ b/macros/latex/contrib/oberdiek/letltxmacro.dtx
@@ -992,14 +992,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/letltxmacro.pdf b/macros/latex/contrib/oberdiek/letltxmacro.pdf
index be2595a9a4..6f43879fe1 100644
--- a/macros/latex/contrib/oberdiek/letltxmacro.pdf
+++ b/macros/latex/contrib/oberdiek/letltxmacro.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/listingsutf8.dtx b/macros/latex/contrib/oberdiek/listingsutf8.dtx
index bc0389081d..e62f889200 100644
--- a/macros/latex/contrib/oberdiek/listingsutf8.dtx
+++ b/macros/latex/contrib/oberdiek/listingsutf8.dtx
@@ -625,14 +625,6 @@ public class ExampleUTF8 {
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/listingsutf8.pdf b/macros/latex/contrib/oberdiek/listingsutf8.pdf
index 3da5802937..c0685ac033 100644
--- a/macros/latex/contrib/oberdiek/listingsutf8.pdf
+++ b/macros/latex/contrib/oberdiek/listingsutf8.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/ltxcmds.dtx b/macros/latex/contrib/oberdiek/ltxcmds.dtx
index 9dfd932ed7..d0e75a14b7 100644
--- a/macros/latex/contrib/oberdiek/ltxcmds.dtx
+++ b/macros/latex/contrib/oberdiek/ltxcmds.dtx
@@ -2940,14 +2940,6 @@ X=%
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/ltxcmds.pdf b/macros/latex/contrib/oberdiek/ltxcmds.pdf
index bc96f1bd42..5c397d0b3c 100644
--- a/macros/latex/contrib/oberdiek/ltxcmds.pdf
+++ b/macros/latex/contrib/oberdiek/ltxcmds.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/luacolor.dtx b/macros/latex/contrib/oberdiek/luacolor.dtx
index 65959b4982..310689bd88 100644
--- a/macros/latex/contrib/oberdiek/luacolor.dtx
+++ b/macros/latex/contrib/oberdiek/luacolor.dtx
@@ -1024,14 +1024,6 @@ end
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/luacolor.pdf b/macros/latex/contrib/oberdiek/luacolor.pdf
index 36d0822d66..a11284092d 100644
--- a/macros/latex/contrib/oberdiek/luacolor.pdf
+++ b/macros/latex/contrib/oberdiek/luacolor.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/magicnum.dtx b/macros/latex/contrib/oberdiek/magicnum.dtx
index 0147bf1f05..8b2b087a89 100644
--- a/macros/latex/contrib/oberdiek/magicnum.dtx
+++ b/macros/latex/contrib/oberdiek/magicnum.dtx
@@ -1377,14 +1377,6 @@ end
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/magicnum.pdf b/macros/latex/contrib/oberdiek/magicnum.pdf
index d529d45b95..3b0f3c9926 100644
--- a/macros/latex/contrib/oberdiek/magicnum.pdf
+++ b/macros/latex/contrib/oberdiek/magicnum.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/mleftright.dtx b/macros/latex/contrib/oberdiek/mleftright.dtx
index cc83370e41..857d12cde0 100644
--- a/macros/latex/contrib/oberdiek/mleftright.dtx
+++ b/macros/latex/contrib/oberdiek/mleftright.dtx
@@ -751,14 +751,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/mleftright.pdf b/macros/latex/contrib/oberdiek/mleftright.pdf
index 9e541703d2..46ecd58cfd 100644
--- a/macros/latex/contrib/oberdiek/mleftright.pdf
+++ b/macros/latex/contrib/oberdiek/mleftright.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/oberdiek.pdf b/macros/latex/contrib/oberdiek/oberdiek.pdf
index 3fc83d1dc4..ac156a5948 100644
--- a/macros/latex/contrib/oberdiek/oberdiek.pdf
+++ b/macros/latex/contrib/oberdiek/oberdiek.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/oberdiek.tex b/macros/latex/contrib/oberdiek/oberdiek.tex
index 0b5cb9e742..e22263796a 100644
--- a/macros/latex/contrib/oberdiek/oberdiek.tex
+++ b/macros/latex/contrib/oberdiek/oberdiek.tex
@@ -7,7 +7,7 @@
\newcommand*{\Author}{Heiko Oberdiek}
\newcommand*{\Email}{ho-tex at tug.org}
-\newcommand*{\Date}{2019/11/12}
+\newcommand*{\Date}{2019/11/24}
% Copyright (C) 2006-2016 by
% Heiko Oberdiek
@@ -189,8 +189,6 @@
[\entrysep]
\entry{atenddvi}{2007/04/17}{1.1}{At end DVI hook}%
[\entrysep]
-\entry{attachfile2}{2019/07/24}{2.9}{Attach files into PDF}%
-[\entrysep]
\entry{atveryend}{2011/06/30}{1.8}{Hooks at the very end of document}%
[\entrysep]
\entry{auxhook}{2011/03/04}{1.3}{Hooks for auxiliary files}%
@@ -223,8 +221,6 @@
[\entrysep]
\entry{eolgrab}{2011/01/12}{1.0}{Catch arguments delimited by end of line}%
[\entrysep]
-\entry{epstopdf}{2010/02/09}{2.5}{Conversion with epstopdf on the fly}%
-[\entrysep]
\entry{etexcmds}{2011/02/16}{1.5}{Avoid name clashes with \hologo{eTeX} commands}%
[\entrysep]
\entry{fibnum}{2012/04/08}{1.0}{Fibonacci numbers}%
@@ -297,8 +293,6 @@
[\entrysep]
\entry{pdfcolfoot}{2012/01/02}{1.2}{Color stack for footnotes with \hologo{pdfTeX}}%
[\entrysep]
-\entry{pdfcolmk}{2008/08/11}{1.2}{Color support for \hologo{pdfTeX} via marks}%
-[\entrysep]
\entry{pdfcolparallel}{2010/01/11}{1.3}{Color stacks support for parallel}%
[\entrysep]
\entry{pdfcolparcolumns}{2010/01/11}{1.3}{Color stacks for parcolumns}%
@@ -311,8 +305,6 @@
[\entrysep]
\entry{pdfrender}{2010/01/28}{1.2}{Access to some PDF graphics parameters}%
[\entrysep]
-\entry{pdftexcmds}{2019/07/25}{0.30}{Utility functions of \hologo{pdfTeX} for \hologo{LuaTeX}}%
-[\entrysep]
\entry{picture}{2009/10/11}{1.3}{Dimens for picture macros}%
[\entrysep]
\entry{pmboxdraw}{2011/03/24}{1.1}{Poor man's box drawing characters}%
@@ -425,19 +417,6 @@ to \cs{AtEndDocument}.
\tocinclude{atenddvi}
\newpage
-\subsection{\pkgsectformat{attachfile2}}
-\label{attachfile2}
-\begin{abstract}
-This package can be used to attach files to a PDF document.
-It is a further development of Scott Pakin's package
-\xpackage{attachfile} for \pdfTeX. Apart from bug fixes,
-package \xpackage{attachfile2} adds support for \xoption{dvips},
-some new options, gets and writes meta information data about
-the attached files.
-\end{abstract}
-\tocinclude{attachfile2}
-
-\newpage
\subsection{\pkgsectformat{atveryend}}
\label{atveryend}
\begin{abstract}
@@ -602,17 +581,6 @@ to catch an argument that is delimited by the line end.
\tocinclude{eolgrab}
\newpage
-\subsection{\pkgsectformat{epstopdf}}
-\label{epstopdf}
-\begin{abstract}
-This packages adds support of handling eps images
-to package \xpackage{graphics} or \xpackage{graphicx}
-with option \xoption{pdftex}. If an eps image is detected,
-epstopdf is automatically called to convert it to pdf format.
-\end{abstract}
-\tocinclude{epstopdf}
-
-\newpage
\subsection{\pkgsectformat{etexcmds}}
\label{etexcmds}
\begin{abstract}
@@ -949,15 +917,6 @@ across pages.
\tocinclude{pdfcolfoot}
\newpage
-\subsection{\pkgsectformat{pdfcolmk}}
-\label{pdfcolmk}
-\begin{abstract}
-This package tries a solution for the missing color
-stack of \pdfTeX.
-\end{abstract}
-\tocinclude{pdfcolmk}
-
-\newpage
\subsection{\pkgsectformat{pdfcolparallel}}
\label{pdfcolparallel}
\begin{abstract}
@@ -1016,15 +975,6 @@ provides an interface for setting these parameters.
\end{abstract}
\tocinclude{pdfrender}
-\newpage
-\subsection{\pkgsectformat{pdftexcmds}}
-\label{pdftexcmds}
-\begin{abstract}
-\hologo{LuaTeX} provides most of the commands of \hologo{pdfTeX} 1.40. However
-a number of utility functions are removed. This package tries to fill
-the gap and implements some of the missing primitive using Lua.
-\end{abstract}
-\tocinclude{pdftexcmds}
\newpage
\subsection{\pkgsectformat{picture}}
diff --git a/macros/latex/contrib/oberdiek/pagegrid.dtx b/macros/latex/contrib/oberdiek/pagegrid.dtx
index 1efb0cde26..6e81bfaa7c 100644
--- a/macros/latex/contrib/oberdiek/pagegrid.dtx
+++ b/macros/latex/contrib/oberdiek/pagegrid.dtx
@@ -917,14 +917,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pagegrid.pdf b/macros/latex/contrib/oberdiek/pagegrid.pdf
index 3d63d631d0..04fa0160f6 100644
--- a/macros/latex/contrib/oberdiek/pagegrid.pdf
+++ b/macros/latex/contrib/oberdiek/pagegrid.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pagesel.dtx b/macros/latex/contrib/oberdiek/pagesel.dtx
index acde4c62b9..161c25b813 100644
--- a/macros/latex/contrib/oberdiek/pagesel.dtx
+++ b/macros/latex/contrib/oberdiek/pagesel.dtx
@@ -670,14 +670,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pagesel.pdf b/macros/latex/contrib/oberdiek/pagesel.pdf
index 9b0f8db976..927d5b3b4a 100644
--- a/macros/latex/contrib/oberdiek/pagesel.pdf
+++ b/macros/latex/contrib/oberdiek/pagesel.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfcol.dtx b/macros/latex/contrib/oberdiek/pdfcol.dtx
index d99d11fa25..3b08d0a6c1 100644
--- a/macros/latex/contrib/oberdiek/pdfcol.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcol.dtx
@@ -973,14 +973,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdfcol.pdf b/macros/latex/contrib/oberdiek/pdfcol.pdf
index e1aa8be514..370fa5b870 100644
--- a/macros/latex/contrib/oberdiek/pdfcol.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcol.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfcolfoot.dtx b/macros/latex/contrib/oberdiek/pdfcolfoot.dtx
index be01c4650e..b812a47dd4 100644
--- a/macros/latex/contrib/oberdiek/pdfcolfoot.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcolfoot.dtx
@@ -564,14 +564,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdfcolfoot.pdf b/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
index da4a567e70..1c70a6ee25 100644
--- a/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfcolmk.dtx b/macros/latex/contrib/oberdiek/pdfcolmk.dtx
deleted file mode 100644
index fc74f05fb3..0000000000
--- a/macros/latex/contrib/oberdiek/pdfcolmk.dtx
+++ /dev/null
@@ -1,1011 +0,0 @@
-% \iffalse meta-comment
-%
-% File: pdfcolmk.dtx
-% Version: 2016/05/16 v1.3
-% Info: Color support for pdfTeX via marks
-%
-% Copyright (C) 2000, 2005-2008 by
-% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-% 2016
-% https://github.com/ho-tex/oberdiek/issues
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-% https://www.latex-project.org/lppl/lppl-1-3c.txt
-% and the latest version of this license is in
-% https://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% The Current Maintainers of this work are
-% Heiko Oberdiek and the Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
-%
-% This work consists of the main source file pdfcolmk.dtx
-% and the derived files
-% pdfcolmk.sty, pdfcolmk.pdf, pdfcolmk.ins, pdfcolmk.drv.
-%
-% Distribution:
-% CTAN:macros/latex/contrib/oberdiek/pdfcolmk.dtx
-% CTAN:macros/latex/contrib/oberdiek/pdfcolmk.pdf
-%
-% Unpacking:
-% (a) If pdfcolmk.ins is present:
-% tex pdfcolmk.ins
-% (b) Without pdfcolmk.ins:
-% tex pdfcolmk.dtx
-% (c) If you insist on using LaTeX
-% latex \let\install=y\input{pdfcolmk.dtx}
-% (quote the arguments according to the demands of your shell)
-%
-% Documentation:
-% (a) If pdfcolmk.drv is present:
-% latex pdfcolmk.drv
-% (b) Without pdfcolmk.drv:
-% latex pdfcolmk.dtx; ...
-% The class ltxdoc loads the configuration file ltxdoc.cfg
-% if available. Here you can specify further options, e.g.
-% use A4 as paper format:
-% \PassOptionsToClass{a4paper}{article}
-%
-% Programm calls to get the documentation (example):
-% pdflatex pdfcolmk.dtx
-% makeindex -s gind.ist pdfcolmk.idx
-% pdflatex pdfcolmk.dtx
-% makeindex -s gind.ist pdfcolmk.idx
-% pdflatex pdfcolmk.dtx
-%
-% Installation:
-% TDS:tex/latex/oberdiek/pdfcolmk.sty
-% TDS:doc/latex/oberdiek/pdfcolmk.pdf
-% TDS:source/latex/oberdiek/pdfcolmk.dtx
-%
-%<*ignore>
-\begingroup
- \catcode123=1 %
- \catcode125=2 %
- \def\x{LaTeX2e}%
-\expandafter\endgroup
-\ifcase 0\ifx\install y1\fi\expandafter
- \ifx\csname processbatchFile\endcsname\relax\else1\fi
- \ifx\fmtname\x\else 1\fi\relax
-\else\csname fi\endcsname
-%</ignore>
-%<*install>
-\input docstrip.tex
-\Msg{************************************************************************}
-\Msg{* Installation}
-\Msg{* Package: pdfcolmk 2016/05/16 v1.3 Color support for pdfTeX via marks (HO)}
-\Msg{************************************************************************}
-
-\keepsilent
-\askforoverwritefalse
-
-\let\MetaPrefix\relax
-\preamble
-
-This is a generated file.
-
-Project: pdfcolmk
-Version: 2016/05/16 v1.3
-
-Copyright (C) 2000, 2005-2008 by
- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. This version of this license is in
- https://www.latex-project.org/lppl/lppl-1-3c.txt
-and the latest version of this license is in
- https://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-The Current Maintainers of this work are
-Heiko Oberdiek and the Oberdiek Package Support Group
-https://github.com/ho-tex/oberdiek/issues
-
-
-This work consists of the main source file pdfcolmk.dtx
-and the derived files
- pdfcolmk.sty, pdfcolmk.pdf, pdfcolmk.ins, pdfcolmk.drv.
-
-\endpreamble
-\let\MetaPrefix\DoubleperCent
-
-\generate{%
- \file{pdfcolmk.ins}{\from{pdfcolmk.dtx}{install}}%
- \file{pdfcolmk.drv}{\from{pdfcolmk.dtx}{driver}}%
- \usedir{tex/latex/oberdiek}%
- \file{pdfcolmk.sty}{\from{pdfcolmk.dtx}{package}}%
- \nopreamble
- \nopostamble
-% \usedir{source/latex/oberdiek/catalogue}%
-% \file{pdfcolmk.xml}{\from{pdfcolmk.dtx}{catalogue}}%
-}
-
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
-\Msg{*}
-\Msg{* pdfcolmk.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the file `pdfcolmk.drv'}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-
-\endbatchfile
-%</install>
-%<*ignore>
-\fi
-%</ignore>
-%<*driver>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{pdfcolmk.drv}%
- [2016/05/16 v1.3 Color support for pdfTeX via marks (HO)]%
-\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/11/22]
-\begin{document}
- \DocInput{pdfcolmk.dtx}%
-\end{document}
-%</driver>
-% \fi
-%
-%
-% \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
-% Lower-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
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
-% \GetFileInfo{pdfcolmk.drv}
-%
-% \title{The \xpackage{pdfcolmk} package}
-% \date{2016/05/16 v1.3}
-% \author{Heiko Oberdiek\thanks
-% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
-%
-% \maketitle
-%
-% \begin{abstract}
-% This package tries a solution for the missing color
-% stack of \pdfTeX.
-% \end{abstract}
-%
-% \tableofcontents
-%
-% \section{Documentation}
-%
-% \subsection{Introduction}
-%
-% This package uses a mark register in order to solve the
-% problem of a missing color stack of \pdfTeX\ prior 1.40.0.
-% Since this version of \pdfTeX\ a color stack is available
-% and supported by \xfile{pdftex.def} 2007/01/01 v0.04a.
-% In this case this package is obsolete and the package
-% stops its loading.
-%
-% \subsection{Background}
-%
-% After the Dante meeting (Clausthal 2000) I have started
-% to experiment with the eTeX method of a \emph{colour} mark.
-% One of the major problems is the understanding of the
-% output routine and the need to rewrite it because of
-% missing hooks. Currently I have made some tests in
-% in onecolumn and twocolumn mode, but the state is
-% experimental.
-%
-% \subsection{Limitations}
-%
-% \begin{itemize}
-% \item Mark limitations: page breaks in math.
-% \item \LaTeX's output routine is redefinded.
-% \begin{itemize}
-% \item Changes in the output routine of newer versions
-% of LaTeX are not detected.
-% \item Packages that change the output routine are not
-% supported.
-% \end{itemize}
-% \item It does not support several independent text
-% streams like footnotes.
-% \item Limitations in float and marginpar support.
-% \end{itemize}
-%
-% \subsection{Recommendation}
-%
-% \eTeX\ (for additional mark register)
-% Without \eTeX\ \LaTeX's mark commands are redefined
-% to store an additional color value.
-%
-% \subsection{Usage}
-%
-% Load after package color:
-% \begin{quote}
-% |\usepackage[pdftex]{color}|\\
-% |\usepackage{pdfcolmk}|
-% \end{quote}
-%
-% \subsection{Compatibility}
-%
-% \begin{itemize}
-% \item Load the following packages after \xpackage{pdfcolmk}:
-% \begin{quote}
-% \xpackage{mparhack.sty}
-% \end{quote}
-% \item Load the following packages before \xpackage{pdfcolmk}:
-% \begin{quote}
-% \xpackage{marn.sty}\\
-% \xpackage{newmarn.sty}
-% \end{quote}
-% \item Supported \cs{@addmarginpar} patch:
-% \begin{quote}
-% \xpackage{latex/base/latex.ltx}\\
-% \xpackage{memoir.cls}\\
-% \xpackage{poemscol/marn.sty}, \xpackage{poemscol/newmarn.sty}\\
-% \xpackage{mparhack.sty}
-% \end{quote}
-% \item Unsupported \cs{@addmarginpar} patch:
-% \begin{quote}
-% \xpackage{lineno.sty}\\
-% \xpackage{sttools/marginal.sty}\\
-% \xpackage{revtex4.cls}
-% \end{quote}
-% \end{itemize}
-%
-% \StopEventually{
-% }
-%
-% \section{Implementation}
-%
-% \begin{macrocode}
-%<*package>
-% \end{macrocode}
-% Package identification.
-% \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pdfcolmk}%
- [2016/05/16 v1.3 Color support for pdfTeX via marks (HO)]
-% \end{macrocode}
-%
-% \begin{macrocode}
-\@ifundefined{ver@pdftex.def}{%
- \PackageWarningNoLine{pdfcolmk}{%
- Nothing to fix, because \string`pdftex.def\string' not loaded%
- }%
- \endinput
-}{}
-\@ifpackageloaded{color}{}{%
- \PackageWarningNoLine{pdfcolmk}{%
- Nothing to fix, because \string`color.sty\string' not loaded%
- }%
- \endinput
-}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname main@pdfcolorstack\endcsname\relax
-\else
- % pdftex.def >= 2007/01/01 0.04a and pdfTeX >= 1.40.0
- \begingroup
- \let\on@line\@empty
- \PackageInfo{pdfcolmk}{%
- The color stack of pdfTeX \string>\string= 1.40 is used. %
- Therefore\MessageBreak
- this package is not necessary and not loaded%
- }%
- \endgroup
- \expandafter\endinput
-\fi
-
-\PackageInfo{pdfcolmk}{%
- This package tries to simulate dvips's color stack\MessageBreak
- for pdfTeX based on a mark register of e-TeX.\MessageBreak
- It redefines LaTeX's output routine. Therefore\MessageBreak
- use with care, no warranties%
-}
-
-\ifx\marks\@undefined
-
- \let\pec@mark\mark
- \let\pec@value\empty
- \long\def\mark#1{%
- \protected@xdef\pec@value{#1}%
- \pec@setmark
- }%
- \def\pec@setmark{%
- \begingroup
- \@temptokena\expandafter{\pec@value}%
- \pec@mark{{\current@color}\the\@temptokena}%
- \endgroup
- }%
- \def\pec@getmark{%
- \xdef\pec@botcolor{%
- \expandafter\@firstofthree\botmark\@empty\@empty\@empty
- }%
- }%
- \long\def\@firstofthree#1#2#3{#1}%
- \CheckCommand{\@leftmark}[2]{#1}%
- \CheckCommand{\@rightmark}[2]{#2}%
- \CheckCommand*{\leftmark}{%
- \expandafter\@leftmark\botmark\@empty\@empty
- }%
- \CheckCommand*{\rightmark}{%
- \expandafter\@rightmark\firstmark\@empty\@empty
- }%
- \long\def\@leftmark#1#2#3{#2}%
- \long\def\@rightmark#1#2#3{#3}%
- \g@addto@macro\leftmark\@empty
- \g@addto@macro\rightmark\@empty
-
-\else
-
- \RequirePackage{etex}[1998/03/26]%
- \newmarks\pec@marks
- \def\pec@setmark{\marks\pec@marks{\current@color}}%
- \def\pec@getmark{\xdef\pec@botcolor{\botmarks\pec@marks}}%
-
-\fi
-% \end{macrocode}
-%
-% \subsection{\cs{marginpar} fix}
-%
-% \begin{macrocode}
-\chardef\pec@result\z@
-\def\pec@temp#1{%
- \chardef\pec@result\@ne
- \begingroup
- \let\on@line\@empty
- \PackageInfo{pdfcolmk}{%
- Patch for \string\@addmarginpar\space applied (#1)%
- }%
- \endgroup
-}
-% \end{macrocode}
-%
-% \subsubsection{latex/base/latex.ltx}
-%
-% \begin{macrocode}
-\def\pec@addmarginpar{%
- \@next\@marbox\@currlist{%
- \@cons\@freelist\@marbox
- \@cons\@freelist\@currbox
- }\@latexbug
- \@tempcnta\@ne
- \if@twocolumn
- \if@firstcolumn
- \@tempcnta\m@ne
- \fi
- \else
- \if@mparswitch
- \ifodd\c@page
- \else
- \@tempcnta\m@ne
- \fi
- \fi
- \if@reversemargin \@tempcnta -\@tempcnta \fi
- \fi
- \ifnum\@tempcnta <\z@ \global\setbox\@marbox\box\@currbox \fi
- \@tempdima\@mparbottom
- \advance\@tempdima -\@pageht
- \advance\@tempdima\ht\@marbox
- \ifdim\@tempdima >\z@
- \@latex@warning@no@line{Marginpar on page \thepage\space moved}%
- \else
- \@tempdima\z@
- \fi
- \global\@mparbottom\@pageht
- \global\advance\@mparbottom\@tempdima
- \global\advance\@mparbottom\dp\@marbox
- \global\advance\@mparbottom\marginparpush
- \advance\@tempdima -\ht\@marbox
- \global\setbox\@marbox\vbox{%
- \vskip \@tempdima
- \box \@marbox
- }%
- \global \ht\@marbox \z@
- \global \dp\@marbox \z@
- \kern -\@pagedp
- \nointerlineskip
- \hb@xt@\columnwidth{%
- \ifnum \@tempcnta >\z@
- \hskip\columnwidth
- \hskip\marginparsep
- \else
- \hskip -\marginparsep
- \hskip -\marginparwidth
- \fi
- \box\@marbox \hss
- }%
- \nointerlineskip
- \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}%
-}
-\ifx\pec@addmarginpar\@addmarginpar
- \pec@temp{latex/base}%
-\fi
-% \end{macrocode}
-%
-% \subsubsection{memoir.cls}
-%
-% \begin{macrocode}
-\def\pec@addmarginpar{%
- \checkoddpage
- \@next\@marbox\@currlist{%
- \@cons\@freelist\@marbox
- \@cons\@freelist\@currbox
- }\@latexbug
- \@tempcnta\@ne
- \if@twocolumn
- \if@firstcolumn
- \@tempcnta\m@ne
- \fi
- \else
- \if@mparswitch
- \ifoddpage
- \else
- \@tempcnta\m@ne
- \fi
- \fi
- \if@reversemargin
- \@tempcnta -\@tempcnta
- \fi
- \fi
- \ifnum\@tempcnta <\z@
- \global\setbox\@marbox\box\@currbox
- \fi
- \@tempdima\@mparbottom
- \advance\@tempdima -\@pageht
- \advance\@tempdima\ht\@marbox
- \ifdim\@tempdima >\z@
- \@latex@warning@no@line{%
- Marginpar on page \thepage\space moved by \the\@tempdima
- }%
- \else
- \@tempdima\z@
- \fi
- \global\@mparbottom\@pageht
- \global\advance\@mparbottom\@tempdima
- \global\advance\@mparbottom\dp\@marbox
- \global\advance\@mparbottom\marginparpush
- \advance\@tempdima -\ht\@marbox
- \global\setbox\@marbox\vbox{%
- \vskip \@tempdima
- \box \@marbox
- }%
- \global \ht\@marbox \z@
- \global \dp\@marbox \z@
- \kern -\@pagedp
- \nointerlineskip
- \hb@xt@\columnwidth{%
- \ifnum \@tempcnta >\z@
- \hskip\columnwidth
- \hskip\marginparsep
- \else
- \hskip -\marginparsep
- \hskip -\marginparwidth
- \fi
- \box\@marbox
- \hss
- }%
- \nointerlineskip
- \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}%
-}%
-\ifx\pec@addmarginpar\@addmarginpar
- \pec@temp{memoir.cls}%
-\fi
-% \end{macrocode}
-%
-% \subsubsection{poemscol/marn.sty, poemscol/newmarn.sty}
-%
-% \begin{macrocode}
-\def\pec@addmarginpar{%
- \@next \@marbox\@currlist{%
- \@cons\@freelist\@marbox
- \@cons\@freelist\@currbox
- }\@latexbug
- \global\advance\@mpar@count\m@ne
- \@ifundefined{@marn@\the\@mpar@count @}{% was location logged last time?
- \@tempcnta\@ne % NO: use original LaTeX logic
- \if@twocolumn
- \if@firstcolumn
- \@tempcnta\m@ne
- \fi
- \else
- \if@mparswitch
- \ifodd\c@page
- \else
- \@tempcnta\m@ne
- \fi
- \fi
- \if@reversemargin
- \@tempcnta -\@tempcnta
- \fi
- \fi
- }{%
- \@tempcnta % YES: use record from last time to decide side.
- \@nameuse{@marn@\the\@mpar@count @}%
- \if@reversemargin -\fi \@ne
- }%
- \ifnum\@tempcnta <\z@
- \global\setbox\@marbox\box\@currbox
- \global\let\@marnbottom\@mparbottoml
- \else
- \global\let\@marnbottom\@mparbottom
- \fi
- \@tempdima\@marnbottom \advance\@tempdima -\@pageht
- \advance\@tempdima\ht\@marbox
- \ifdim\@tempdima >\z@
- \@@warning{Marginpar on page \thepage\space moved}%
- \else
- \@tempdima\z@
- \fi
- \global\@marnbottom\@pageht
- \global\advance\@marnbottom\@tempdima
- \global\advance\@marnbottom\dp\@marbox
- \global\advance\@marnbottom\marginparpush
- \advance\@tempdima -\ht\@marbox
- \global\ht\@marbox\z@
- \global\dp\@marbox\z@
- \vskip -\@pagedp
- \vskip\@tempdima\nointerlineskip
- \hbox to\columnwidth{%
- \ifnum \@tempcnta >\z@
- \hskip\columnwidth
- \hskip\marginparsep
- \else
- \hskip -\marginparsep
- \hskip -\marginparwidth
- \fi
- \if@filesw % record where this is for use next time:
- \@marn@log\@mpar@count
- \fi
- \box\@marbox
- \hss
- }%
- \nobreak %% RmS 91/06/21 \nobreak added
- \vskip -\@tempdima
- \nointerlineskip
- \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}%
-}
-\ifx\pec@addmarginpar\@addmarginpar
- \pec@temp{poemscol/(new)marn.sty}%
-\fi
-% \end{macrocode}
-%
-% \subsubsection{refman/refart.cls, refnam/refrep.cls}
-%
-% \begin{macrocode}
-\def\pec@addmarginpar{%
- \@next\@marbox\@currlist{%
- \@cons\@freelist\@marbox
- \@cons\@freelist\@currbox
- }\@latexbug
- \@tempcnta\@ne
- \if@twocolumn
- \if@firstcolumn
- \@tempcnta\m@ne
- \fi
- \else
- \@tempcnta\m@ne
- \fi
- \ifnum\@tempcnta <\z@
- \global\setbox\@marbox\box\@currbox
- \fi
- \@tempdima\@mparbottom
- \advance\@tempdima -\@pageht
- \advance\@tempdima\ht\@marbox
- \ifdim\@tempdima >\z@
- \@@warning{Marginpar on page \thepage\space moved}%
- \else
- \@tempdima\z@
- \fi
- \global\@mparbottom\@pageht
- \global\advance\@mparbottom\@tempdima
- \global\advance\@mparbottom\dp\@marbox
- \global\advance\@mparbottom\marginparpush
- \advance\@tempdima -\ht\@marbox
- \global\setbox\@marbox\vbox{%
- \vskip \@tempdima \box \@marbox
- }%
- \global \ht\@marbox \z@
- \global \dp\@marbox \z@
- \kern -\@pagedp
- \nointerlineskip
- \hb@xt@\columnwidth{%
- \ifnum \@tempcnta >\z@
- \hskip\columnwidth
- \hskip\marginparsep
- \else
- \hskip -\marginparsep
- \hskip -\marginparwidth
- \fi
- \box\@marbox
- \hss
- }%
- \nointerlineskip
- \hbox{\vrule \@height\z@ \@width\z@ \@depth\@pagedp}%
-}
-\ifx\pec@addmarginpar\@addmarginpar
- \pec@temp{ref(art|rep).cls}%
-\fi
-
-\ifcase\pec@result
- \PackageInfo{pdfcolmk}{%
- Fix for \string\@addmarginpar\space is omitted, %
- because this variant\MessageBreak
- of \string\@addmarginpar\space
- is not recognized%
- }%
-\else
- % apply patch for \@addmarginpar
- \def\pec@PatchAddMarginpar#1\columnwidth#2#3\@nil{%
- \pec@PatchAddMarginparI#2\@nil{#1}{#3}%
- }%
- \def\pec@PatchAddMarginparI#1\box\@marbox\hss#2\@nil#3#4{%
- \def\@addmarginpar{%
- #3%
- \columnwidth{%
- #1%
- \pdfliteral{q}%
- \rlap{%
- \box\@marbox
- }%
- \pdfliteral{Q}%
- \hss
- #2%
- }%
- #4%
- }%
- }%
- \expandafter\pec@PatchAddMarginpar\@addmarginpar\@nil
-\fi
-% \end{macrocode}
-%
-% \subsection{Color fix}
-%
-% \begin{macrocode}
-\def\set@color{%
- \pdfliteral{\current@color}%
- \ifinner
- \else
- \pec@setmark
- \fi
- \aftergroup\reset@color
-}
-\def\reset@color{%
- \pdfliteral{\current@color}%
- \ifinner
- \else
- \pec@setmark
- \fi
-}
-
-\let\pec@botcolor\current@color
-
-\def\pec@PatchVBoxCCLV{%
- \ifx\pec@botcolor\@empty
- \else
- \setbox\@cclv\vbox{%
- \pdfliteral{\pec@botcolor}%
- \unvbox\@cclv
- }%
- \fi
- \pec@getmark
-}
-
-\def\pec@PatchAlreadyInBox{%
- \ifx\pec@botcolor\@empty
- \else
- \pdfliteral{\pec@botcolor}%
- \fi
- \pec@getmark
-}
-
-\@ifclassloaded{memoir}{%
- \expandafter\def\expandafter\mem@makecol\expandafter{%
- \expandafter\pec@PatchVBoxCCLV
- \mem@makecol
- }%
- \endinput
-}{}
-
-\@ifclassloaded{seminar}{%
- \newcommand\pec@org@makeslide{}%
- \let\pec@org@makeslide\@makeslide
- \def\@makeslide{%
- \pec@PatchVBoxCCLV
- \pec@org@makeslide
- }%
- \endinput
-}{}
-
-\long\def\pec@output#1\@specialoutput\else#2\pec@end{%
- \begingroup
- \def\x{#2}%
- \expandafter\endgroup
- \ifx\x\@empty
- \PackageWarningNoLine{pdfcolmk}{%
- Unexpected \string\output\space routine detected,%
- \MessageBreak
- loading of package stopped%
- }%
- \expandafter\endinput
- \fi
-}
-\expandafter\expandafter\expandafter\pec@output
-\expandafter\@firstofone\the\output\@specialoutput\else\pec@end
-
-\long\def\pec@output#1\@specialoutput\else#2\pec@end{%
- \output{%
- #1\@specialoutput\else
- \pec@PatchVBoxCCLV
- #2%
- }%
-}
-\expandafter\expandafter\expandafter\pec@output
-\expandafter\@firstofone\the\output\pec@end
-% \end{macrocode}
-%
-% \begin{macrocode}
-%</package>
-% \end{macrocode}
-%
-% \section{Installation}
-%
-% \subsection{Download}
-%
-% \paragraph{Package.} This package is available on
-% CTAN\footnote{\CTANpkg{pdfcolmk}}:
-% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolmk.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolmk.pdf}] Documentation.
-% \end{description}
-%
-%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-% |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
-% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
-%
-% \subsection{Package installation}
-%
-% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
-% \docstrip\ archive. The files are extracted by running the
-% \xfile{.dtx} through \plainTeX:
-% \begin{quote}
-% \verb|tex pdfcolmk.dtx|
-% \end{quote}
-%
-% \paragraph{TDS.} Now the different files must be moved into
-% the different directories in your installation TDS tree
-% (also known as \xfile{texmf} tree):
-% \begin{quote}
-% \def\t{^^A
-% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-% pdfcolmk.sty & tex/latex/oberdiek/pdfcolmk.sty\\
-% pdfcolmk.pdf & doc/latex/oberdiek/pdfcolmk.pdf\\
-% pdfcolmk.dtx & source/latex/oberdiek/pdfcolmk.dtx\\
-% \end{tabular}^^A
-% }^^A
-% \sbox0{\t}^^A
-% \ifdim\wd0>\linewidth
-% \begingroup
-% \advance\linewidth by\leftmargin
-% \advance\linewidth by\rightmargin
-% \edef\x{\endgroup
-% \def\noexpand\lw{\the\linewidth}^^A
-% }\x
-% \def\lwbox{^^A
-% \leavevmode
-% \hbox to \linewidth{^^A
-% \kern-\leftmargin\relax
-% \hss
-% \usebox0
-% \hss
-% \kern-\rightmargin\relax
-% }^^A
-% }^^A
-% \ifdim\wd0>\lw
-% \sbox0{\small\t}^^A
-% \ifdim\wd0>\linewidth
-% \ifdim\wd0>\lw
-% \sbox0{\footnotesize\t}^^A
-% \ifdim\wd0>\linewidth
-% \ifdim\wd0>\lw
-% \sbox0{\scriptsize\t}^^A
-% \ifdim\wd0>\linewidth
-% \ifdim\wd0>\lw
-% \sbox0{\tiny\t}^^A
-% \ifdim\wd0>\linewidth
-% \lwbox
-% \else
-% \usebox0
-% \fi
-% \else
-% \lwbox
-% \fi
-% \else
-% \usebox0
-% \fi
-% \else
-% \lwbox
-% \fi
-% \else
-% \usebox0
-% \fi
-% \else
-% \lwbox
-% \fi
-% \else
-% \usebox0
-% \fi
-% \else
-% \lwbox
-% \fi
-% \else
-% \usebox0
-% \fi
-% \end{quote}
-% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
-% TDS installing feature, then some files can already be in the right
-% place, see the documentation of \docstrip.
-%
-% \subsection{Refresh file name databases}
-%
-% If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
-% these. For example, \teTeX\ users run \verb|texhash| or
-% \verb|mktexlsr|.
-%
-% \subsection{Some details for the interested}
-%
-% \paragraph{Unpacking with \LaTeX.}
-% The \xfile{.dtx} chooses its action depending on the format:
-% \begin{description}
-% \item[\plainTeX:] Run \docstrip\ and extract the files.
-% \item[\LaTeX:] Generate the documentation.
-% \end{description}
-% If you insist on using \LaTeX\ for \docstrip\ (really,
-% \docstrip\ does not need \LaTeX), then inform the autodetect routine
-% about your intention:
-% \begin{quote}
-% \verb|latex \let\install=y\input{pdfcolmk.dtx}|
-% \end{quote}
-% Do not forget to quote the argument according to the demands
-% of your shell.
-%
-% \paragraph{Generating the documentation.}
-% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
-% the documentation. The process can be configured by the
-% configuration file \xfile{ltxdoc.cfg}. For instance, put this
-% line into this file, if you want to have A4 as paper format:
-% \begin{quote}
-% \verb|\PassOptionsToClass{a4paper}{article}|
-% \end{quote}
-% An example follows how to generate the
-% documentation with pdf\LaTeX:
-% \begin{quote}
-%\begin{verbatim}
-%pdflatex pdfcolmk.dtx
-%makeindex -s gind.ist pdfcolmk.idx
-%pdflatex pdfcolmk.dtx
-%makeindex -s gind.ist pdfcolmk.idx
-%pdflatex pdfcolmk.dtx
-%\end{verbatim}
-% \end{quote}
-%
-% \begin{History}
-% \begin{Version}{2000/08/27 v0.1}
-% \item
-% First published version in newsgroup \xnewsgroup{comp.text.tex}:\\
-% \URL{``\link{pdftex: bug with colors?}''}^^A
-% {https://groups.google.com/group/comp.text.tex/msg/6f088e69e4085d2c}
-% \end{Version}
-% \begin{Version}{2000/09/02 v0.2}
-% \item
-% Next try.
-% \end{Version}
-% \begin{Version}{2000/09/02 v0.3}
-% \item
-% Solution without \eTeX\ added.
-% \end{Version}
-% \begin{Version}{2000/09/06 v0.4}
-% \item
-% Patch commands added.
-% \item
-% Patch for seminar.cls added.
-% \end{Version}
-% \begin{Version}{2000/09/06 v0.5}
-% \item
-% Bug fix: initialization of \cs{pec@value} added.
-% \end{Version}
-% \begin{Version}{2005/06/15 v0.6}
-% \item
-% Support for \cs{marginpar} added.
-% See thread in \xnewsgroup{comp.text.tex}:\\
-% \URL{``\link{Using \cs{textcolor} and \cs{marginpar} together}''}^^A
-% {https://groups.google.com/group/comp.text.tex/msg/38ed58f8845a2a4f}
-% \end{Version}
-% \begin{Version}{2005/07/09 v0.7}
-% \item
-% Output support added for \xpackage{memoir},
-% provided by Lars Madsen.
-% \end{Version}
-% \begin{Version}{2006/02/20 v0.8}
-% \item
-% Code is not changed.
-% \item
-% DTX framework.
-% \end{Version}
-% \begin{Version}{2007/01/01 v1.0}
-% \item
-% If \xfile{pdftex.def} \textgreater= 2007/01/01 v0.04a is used with
-% \pdfTeX\ \textgreater= 1.40.0, then package \xpackage{pdfcolmk} is obsolete.
-% \end{Version}
-% \begin{Version}{2007/04/11 v1.1}
-% \item
-% Line ends sanitized.
-% \end{Version}
-% \begin{Version}{2008/08/11 v1.2}
-% \item
-% Code is not changed.
-% \item
-% URLs updated.
-% \end{Version}
-% \begin{Version}{2016/05/16 v1.3}
-% \item
-% Documentation updates.
-% \end{Version}
-% \end{History}
-%
-% \PrintIndex
-%
-% \Finale
-\endinput
diff --git a/macros/latex/contrib/oberdiek/pdfcolmk.pdf b/macros/latex/contrib/oberdiek/pdfcolmk.pdf
deleted file mode 100644
index 202eeb6933..0000000000
--- a/macros/latex/contrib/oberdiek/pdfcolmk.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfcolparallel.dtx b/macros/latex/contrib/oberdiek/pdfcolparallel.dtx
index 755000fb16..4dc572d785 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparallel.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcolparallel.dtx
@@ -929,14 +929,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdfcolparallel.pdf b/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
index cd06a4a9ed..eaea95a370 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx b/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx
index ce340c0379..db8b4cdb7c 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx
@@ -612,14 +612,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf b/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
index 1f1ebd1ccf..7343948a4c 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfcrypt.dtx b/macros/latex/contrib/oberdiek/pdfcrypt.dtx
index 39ed3c78e9..ed5e896c87 100644
--- a/macros/latex/contrib/oberdiek/pdfcrypt.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcrypt.dtx
@@ -906,14 +906,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdfcrypt.pdf b/macros/latex/contrib/oberdiek/pdfcrypt.pdf
index d206cacf36..1cd5861f3d 100644
--- a/macros/latex/contrib/oberdiek/pdfcrypt.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcrypt.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfescape.dtx b/macros/latex/contrib/oberdiek/pdfescape.dtx
index 3a77f65261..391d608d3e 100644
--- a/macros/latex/contrib/oberdiek/pdfescape.dtx
+++ b/macros/latex/contrib/oberdiek/pdfescape.dtx
@@ -2072,14 +2072,6 @@ $ \the\count\ltx@cclv
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdfescape.pdf b/macros/latex/contrib/oberdiek/pdfescape.pdf
index d733ba1bf1..e70cef8999 100644
--- a/macros/latex/contrib/oberdiek/pdfescape.pdf
+++ b/macros/latex/contrib/oberdiek/pdfescape.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdflscape.dtx b/macros/latex/contrib/oberdiek/pdflscape.dtx
index 547a06e1d3..3df9d44327 100644
--- a/macros/latex/contrib/oberdiek/pdflscape.dtx
+++ b/macros/latex/contrib/oberdiek/pdflscape.dtx
@@ -861,14 +861,6 @@ public class ExtractRotate {
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdflscape.pdf b/macros/latex/contrib/oberdiek/pdflscape.pdf
index 15750dc4d7..36ae64fad7 100644
--- a/macros/latex/contrib/oberdiek/pdflscape.pdf
+++ b/macros/latex/contrib/oberdiek/pdflscape.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdfrender.dtx b/macros/latex/contrib/oberdiek/pdfrender.dtx
index 4bbcec9a2a..ad095e871c 100644
--- a/macros/latex/contrib/oberdiek/pdfrender.dtx
+++ b/macros/latex/contrib/oberdiek/pdfrender.dtx
@@ -1696,14 +1696,6 @@ After %
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pdfrender.pdf b/macros/latex/contrib/oberdiek/pdfrender.pdf
index c2002436aa..ad9e8c443d 100644
--- a/macros/latex/contrib/oberdiek/pdfrender.pdf
+++ b/macros/latex/contrib/oberdiek/pdfrender.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pdftexcmds.pdf b/macros/latex/contrib/oberdiek/pdftexcmds.pdf
deleted file mode 100644
index 9968622cb8..0000000000
--- a/macros/latex/contrib/oberdiek/pdftexcmds.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/picture.dtx b/macros/latex/contrib/oberdiek/picture.dtx
index 139ce8c2d6..ceff2dea9a 100644
--- a/macros/latex/contrib/oberdiek/picture.dtx
+++ b/macros/latex/contrib/oberdiek/picture.dtx
@@ -629,14 +629,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/picture.pdf b/macros/latex/contrib/oberdiek/picture.pdf
index a874afcaaf..a5e22bf846 100644
--- a/macros/latex/contrib/oberdiek/picture.pdf
+++ b/macros/latex/contrib/oberdiek/picture.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/pmboxdraw.dtx b/macros/latex/contrib/oberdiek/pmboxdraw.dtx
index 113fe799bf..35c476f457 100644
--- a/macros/latex/contrib/oberdiek/pmboxdraw.dtx
+++ b/macros/latex/contrib/oberdiek/pmboxdraw.dtx
@@ -5416,14 +5416,6 @@ $ \kern.5\pmbd@C
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/pmboxdraw.pdf b/macros/latex/contrib/oberdiek/pmboxdraw.pdf
index 12bf903e46..40aba00872 100644
--- a/macros/latex/contrib/oberdiek/pmboxdraw.pdf
+++ b/macros/latex/contrib/oberdiek/pmboxdraw.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/protecteddef.dtx b/macros/latex/contrib/oberdiek/protecteddef.dtx
index 7c9dca3a37..0b86d8b03f 100644
--- a/macros/latex/contrib/oberdiek/protecteddef.dtx
+++ b/macros/latex/contrib/oberdiek/protecteddef.dtx
@@ -855,14 +855,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/protecteddef.pdf b/macros/latex/contrib/oberdiek/protecteddef.pdf
index fb6bd80338..2b30c1b9b5 100644
--- a/macros/latex/contrib/oberdiek/protecteddef.pdf
+++ b/macros/latex/contrib/oberdiek/protecteddef.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/refcount.dtx b/macros/latex/contrib/oberdiek/refcount.dtx
index dc6df6b5c7..7e242274f3 100644
--- a/macros/latex/contrib/oberdiek/refcount.dtx
+++ b/macros/latex/contrib/oberdiek/refcount.dtx
@@ -1342,14 +1342,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/refcount.pdf b/macros/latex/contrib/oberdiek/refcount.pdf
index 7086e41cdf..8c10768548 100644
--- a/macros/latex/contrib/oberdiek/refcount.pdf
+++ b/macros/latex/contrib/oberdiek/refcount.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/rerunfilecheck.dtx b/macros/latex/contrib/oberdiek/rerunfilecheck.dtx
index 94732005d4..2cb3cbd52b 100644
--- a/macros/latex/contrib/oberdiek/rerunfilecheck.dtx
+++ b/macros/latex/contrib/oberdiek/rerunfilecheck.dtx
@@ -874,14 +874,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/rerunfilecheck.pdf b/macros/latex/contrib/oberdiek/rerunfilecheck.pdf
index 8996fe806e..87fa86a818 100644
--- a/macros/latex/contrib/oberdiek/rerunfilecheck.pdf
+++ b/macros/latex/contrib/oberdiek/rerunfilecheck.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/resizegather.dtx b/macros/latex/contrib/oberdiek/resizegather.dtx
index b335070f08..afc9808fb2 100644
--- a/macros/latex/contrib/oberdiek/resizegather.dtx
+++ b/macros/latex/contrib/oberdiek/resizegather.dtx
@@ -826,14 +826,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/resizegather.pdf b/macros/latex/contrib/oberdiek/resizegather.pdf
index b88ef36c22..c2853465aa 100644
--- a/macros/latex/contrib/oberdiek/resizegather.pdf
+++ b/macros/latex/contrib/oberdiek/resizegather.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/rotchiffre.dtx b/macros/latex/contrib/oberdiek/rotchiffre.dtx
index eab273787f..747aee813e 100644
--- a/macros/latex/contrib/oberdiek/rotchiffre.dtx
+++ b/macros/latex/contrib/oberdiek/rotchiffre.dtx
@@ -1158,14 +1158,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/rotchiffre.pdf b/macros/latex/contrib/oberdiek/rotchiffre.pdf
index 40783bb896..c161579a4d 100644
--- a/macros/latex/contrib/oberdiek/rotchiffre.pdf
+++ b/macros/latex/contrib/oberdiek/rotchiffre.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/scrindex.dtx b/macros/latex/contrib/oberdiek/scrindex.dtx
index 8b754c2297..ddda8f22c1 100644
--- a/macros/latex/contrib/oberdiek/scrindex.dtx
+++ b/macros/latex/contrib/oberdiek/scrindex.dtx
@@ -570,14 +570,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/scrindex.pdf b/macros/latex/contrib/oberdiek/scrindex.pdf
index 961528a70b..a35b135af2 100644
--- a/macros/latex/contrib/oberdiek/scrindex.pdf
+++ b/macros/latex/contrib/oberdiek/scrindex.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/selinput.dtx b/macros/latex/contrib/oberdiek/selinput.dtx
index 36cbd1b5de..2c536b648d 100644
--- a/macros/latex/contrib/oberdiek/selinput.dtx
+++ b/macros/latex/contrib/oberdiek/selinput.dtx
@@ -816,14 +816,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/selinput.pdf b/macros/latex/contrib/oberdiek/selinput.pdf
index 0f78dc3a93..f30f44bdc5 100644
--- a/macros/latex/contrib/oberdiek/selinput.pdf
+++ b/macros/latex/contrib/oberdiek/selinput.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/setouterhbox.dtx b/macros/latex/contrib/oberdiek/setouterhbox.dtx
index 6d85677a0a..760d8d5a00 100644
--- a/macros/latex/contrib/oberdiek/setouterhbox.dtx
+++ b/macros/latex/contrib/oberdiek/setouterhbox.dtx
@@ -968,14 +968,6 @@ by/a/very_long_long_long_path.html}%
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/setouterhbox.pdf b/macros/latex/contrib/oberdiek/setouterhbox.pdf
index a015980ca7..887945ff4f 100644
--- a/macros/latex/contrib/oberdiek/setouterhbox.pdf
+++ b/macros/latex/contrib/oberdiek/setouterhbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/settobox.dtx b/macros/latex/contrib/oberdiek/settobox.dtx
index 59f07638ac..1ba8c60fb1 100644
--- a/macros/latex/contrib/oberdiek/settobox.dtx
+++ b/macros/latex/contrib/oberdiek/settobox.dtx
@@ -580,14 +580,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/settobox.pdf b/macros/latex/contrib/oberdiek/settobox.pdf
index be824220ee..5636e9bdc1 100644
--- a/macros/latex/contrib/oberdiek/settobox.pdf
+++ b/macros/latex/contrib/oberdiek/settobox.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/soulutf8.dtx b/macros/latex/contrib/oberdiek/soulutf8.dtx
index a239f608a1..fc97c5e725 100644
--- a/macros/latex/contrib/oberdiek/soulutf8.dtx
+++ b/macros/latex/contrib/oberdiek/soulutf8.dtx
@@ -1708,14 +1708,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/soulutf8.pdf b/macros/latex/contrib/oberdiek/soulutf8.pdf
index 291441c643..727d4cea46 100644
--- a/macros/latex/contrib/oberdiek/soulutf8.pdf
+++ b/macros/latex/contrib/oberdiek/soulutf8.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/stackrel.dtx b/macros/latex/contrib/oberdiek/stackrel.dtx
index c04ba1f2e5..50119e5424 100644
--- a/macros/latex/contrib/oberdiek/stackrel.dtx
+++ b/macros/latex/contrib/oberdiek/stackrel.dtx
@@ -338,14 +338,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/stackrel.pdf b/macros/latex/contrib/oberdiek/stackrel.pdf
index f9a76ae18e..66000cabe9 100644
--- a/macros/latex/contrib/oberdiek/stackrel.pdf
+++ b/macros/latex/contrib/oberdiek/stackrel.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/stampinclude.dtx b/macros/latex/contrib/oberdiek/stampinclude.dtx
index 62b3d2cf4f..d20f2da6b1 100644
--- a/macros/latex/contrib/oberdiek/stampinclude.dtx
+++ b/macros/latex/contrib/oberdiek/stampinclude.dtx
@@ -480,14 +480,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/stampinclude.pdf b/macros/latex/contrib/oberdiek/stampinclude.pdf
index 0d98223617..587329bd59 100644
--- a/macros/latex/contrib/oberdiek/stampinclude.pdf
+++ b/macros/latex/contrib/oberdiek/stampinclude.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/stringenc.dtx b/macros/latex/contrib/oberdiek/stringenc.dtx
index 7236faf756..9720553751 100644
--- a/macros/latex/contrib/oberdiek/stringenc.dtx
+++ b/macros/latex/contrib/oberdiek/stringenc.dtx
@@ -6604,14 +6604,6 @@ $ \fi
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/stringenc.pdf b/macros/latex/contrib/oberdiek/stringenc.pdf
index c288e4c9e2..b910941478 100644
--- a/macros/latex/contrib/oberdiek/stringenc.pdf
+++ b/macros/latex/contrib/oberdiek/stringenc.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/tabularht.dtx b/macros/latex/contrib/oberdiek/tabularht.dtx
index 559084a35f..010fc42e69 100644
--- a/macros/latex/contrib/oberdiek/tabularht.dtx
+++ b/macros/latex/contrib/oberdiek/tabularht.dtx
@@ -1025,14 +1025,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/tabularht.pdf b/macros/latex/contrib/oberdiek/tabularht.pdf
index ab24beeb09..cf52c402d3 100644
--- a/macros/latex/contrib/oberdiek/tabularht.pdf
+++ b/macros/latex/contrib/oberdiek/tabularht.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/tabularkv.dtx b/macros/latex/contrib/oberdiek/tabularkv.dtx
index 3c3fc3f48c..d9a3335250 100644
--- a/macros/latex/contrib/oberdiek/tabularkv.dtx
+++ b/macros/latex/contrib/oberdiek/tabularkv.dtx
@@ -343,14 +343,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/tabularkv.pdf b/macros/latex/contrib/oberdiek/tabularkv.pdf
index 57324c76a2..0433d0e11e 100644
--- a/macros/latex/contrib/oberdiek/tabularkv.pdf
+++ b/macros/latex/contrib/oberdiek/tabularkv.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/telprint.dtx b/macros/latex/contrib/oberdiek/telprint.dtx
index 8d81cf81f1..329a7b3dc2 100644
--- a/macros/latex/contrib/oberdiek/telprint.dtx
+++ b/macros/latex/contrib/oberdiek/telprint.dtx
@@ -773,14 +773,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/telprint.pdf b/macros/latex/contrib/oberdiek/telprint.pdf
index 9f3e2d984f..088efd0f80 100644
--- a/macros/latex/contrib/oberdiek/telprint.pdf
+++ b/macros/latex/contrib/oberdiek/telprint.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/thepdfnumber.dtx b/macros/latex/contrib/oberdiek/thepdfnumber.dtx
index 98b65bbccf..2195b32745 100644
--- a/macros/latex/contrib/oberdiek/thepdfnumber.dtx
+++ b/macros/latex/contrib/oberdiek/thepdfnumber.dtx
@@ -1432,14 +1432,6 @@ $ \else\ifnum`#2=46 % .
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/thepdfnumber.pdf b/macros/latex/contrib/oberdiek/thepdfnumber.pdf
index 8244592592..7fabbf22f1 100644
--- a/macros/latex/contrib/oberdiek/thepdfnumber.pdf
+++ b/macros/latex/contrib/oberdiek/thepdfnumber.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/transparent.dtx b/macros/latex/contrib/oberdiek/transparent.dtx
index c9a4ca231f..701e643a06 100644
--- a/macros/latex/contrib/oberdiek/transparent.dtx
+++ b/macros/latex/contrib/oberdiek/transparent.dtx
@@ -455,14 +455,6 @@ Hello World
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/transparent.pdf b/macros/latex/contrib/oberdiek/transparent.pdf
index 5d1581280e..eb249ba722 100644
--- a/macros/latex/contrib/oberdiek/transparent.pdf
+++ b/macros/latex/contrib/oberdiek/transparent.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/twoopt.dtx b/macros/latex/contrib/oberdiek/twoopt.dtx
index f63139d4a6..f4528af812 100644
--- a/macros/latex/contrib/oberdiek/twoopt.dtx
+++ b/macros/latex/contrib/oberdiek/twoopt.dtx
@@ -422,14 +422,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/twoopt.pdf b/macros/latex/contrib/oberdiek/twoopt.pdf
index fb3a3d0e53..f9a0777eaa 100644
--- a/macros/latex/contrib/oberdiek/twoopt.pdf
+++ b/macros/latex/contrib/oberdiek/twoopt.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/uniquecounter.dtx b/macros/latex/contrib/oberdiek/uniquecounter.dtx
index 1fd992554e..d11090da70 100644
--- a/macros/latex/contrib/oberdiek/uniquecounter.dtx
+++ b/macros/latex/contrib/oberdiek/uniquecounter.dtx
@@ -848,14 +848,6 @@ and the derived files
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/uniquecounter.pdf b/macros/latex/contrib/oberdiek/uniquecounter.pdf
index e89d429082..95bb0e1215 100644
--- a/macros/latex/contrib/oberdiek/uniquecounter.pdf
+++ b/macros/latex/contrib/oberdiek/uniquecounter.pdf
Binary files differ
diff --git a/macros/latex/contrib/oberdiek/zref.dtx b/macros/latex/contrib/oberdiek/zref.dtx
index d8e7070cd2..0a8e7f0505 100644
--- a/macros/latex/contrib/oberdiek/zref.dtx
+++ b/macros/latex/contrib/oberdiek/zref.dtx
@@ -7,7 +7,7 @@
% Copyright (C) 2006-2012 by
% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
% 2016
-% https://github.com/ho-tex/oberdiek/issueso
+% https://github.com/ho-tex/oberdiek/issues
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -6423,14 +6423,6 @@ the height difference of the two baselines is
% \paragraph{Script installation.}
% Check the directory \xfile{TDS:scripts/oberdiek/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
diff --git a/macros/latex/contrib/oberdiek/zref.pdf b/macros/latex/contrib/oberdiek/zref.pdf
index e5d5de9d07..9a6a9e03a2 100644
--- a/macros/latex/contrib/oberdiek/zref.pdf
+++ b/macros/latex/contrib/oberdiek/zref.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfcolmk/README.md b/macros/latex/contrib/pdfcolmk/README.md
new file mode 100644
index 0000000000..2377abfd29
--- /dev/null
+++ b/macros/latex/contrib/pdfcolmk/README.md
@@ -0,0 +1,14 @@
+# pdfcolmk
+
+legacy stub for pdfcolmk package
+
+
+This package does nothing at all.
+
+The original documented source is available at
+
+https://github.com/ho-tex/old-source
+
+Please report any issues to
+
+https://github.com/ho-tex/pdfcolmk/issues
diff --git a/macros/latex/contrib/pdfcolmk/pdfcolmk.sty b/macros/latex/contrib/pdfcolmk/pdfcolmk.sty
new file mode 100644
index 0000000000..1dc259b5f1
--- /dev/null
+++ b/macros/latex/contrib/pdfcolmk/pdfcolmk.sty
@@ -0,0 +1,24 @@
+% pdfcolmk
+%
+% Copyright 2019 Oberdiek Package Support Group
+%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version.
+
+\ProvidesPackage{pdfcolmk}%
+ [2019/11/24 v2.0 Color support for pdfTeX via marks]
+
+% This is a legacy stub for the original pdfcolmk package
+% which provided color stack support for pdftex prior to
+% release 1.40 (which was released in 2007)
+
+% This package does nothing at all.
+
+% The original documented source is available at
+% https://github.com/ho-tex/old-source
+
+% Please report any issues to
+% https://github.com/ho-tex/pdfcolmk/issues
+
diff --git a/macros/latex/contrib/pdftexcmds/README.md b/macros/latex/contrib/pdftexcmds/README.md
new file mode 100644
index 0000000000..1079a2ccf2
--- /dev/null
+++ b/macros/latex/contrib/pdftexcmds/README.md
@@ -0,0 +1,11 @@
+# pdftexcmds
+pdftexcmds package for LaTeX
+
+
+
+
+
+ doc/latex/pdftexcmds/pdftexcmds.pdf
+ scripts/pdftexcmds/pdftexcmds.lua
+ source/latex/pdftexcmds/pdftexcmds.dtx
+ tex/generic/pdftexcmds/pdftexcmds.sty
diff --git a/macros/latex/contrib/oberdiek/pdftexcmds.dtx b/macros/latex/contrib/pdftexcmds/pdftexcmds.dtx
index a7ce8e7c2a..c7002222ea 100644
--- a/macros/latex/contrib/oberdiek/pdftexcmds.dtx
+++ b/macros/latex/contrib/pdftexcmds/pdftexcmds.dtx
@@ -1,11 +1,12 @@
% \iffalse meta-comment
%
% File: pdftexcmds.dtx
-% Version: 2019/07/25 v0.30
+% Version: 2019/11/24 v0.31
% Info: Utility functions of pdfTeX for LuaTeX
%
-% Copyright (C) 2007, 2009-2011 by
-% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+% Copyright (C)
+% 2007, 2009-2011 Heiko Oberdiek
+% 2016-2019 Oberdiek Package Support Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -21,7 +22,7 @@
%
% The Current Maintainers of this work are
% Heiko Oberdiek and the Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% https://github.com/ho-tex/pdftexcmds/issues
%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
@@ -31,11 +32,11 @@
% pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv,
% pdftexcmds.bib, pdftexcmds-test1.tex, pdftexcmds-test2.tex,
% pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex,
-% oberdiek.pdftexcmds.lua, pdftexcmds.lua.
+% pdftexcmds.lua.
%
% Distribution:
-% CTAN:macros/latex/contrib/oberdiek/pdftexcmds.dtx
-% CTAN:macros/latex/contrib/oberdiek/pdftexcmds.pdf
+% CTAN:macros/latex/contrib/pdftexcmds/pdftexcmds.dtx
+% CTAN:macros/latex/contrib/pdftexcmds/pdftexcmds.pdf
%
% Unpacking:
% (a) If pdftexcmds.ins is present:
@@ -65,15 +66,10 @@
% pdflatex pdftexcmds.dtx
%
% Installation:
-% TDS:tex/generic/oberdiek/pdftexcmds.sty
-% TDS:scripts/oberdiek/oberdiek.pdftexcmds.lua
-% TDS:scripts/oberdiek/pdftexcmds.lua
-% TDS:doc/latex/oberdiek/pdftexcmds.pdf
-% TDS:doc/latex/oberdiek/test/pdftexcmds-test1.tex
-% TDS:doc/latex/oberdiek/test/pdftexcmds-test2.tex
-% TDS:doc/latex/oberdiek/test/pdftexcmds-test-shell.tex
-% TDS:doc/latex/oberdiek/test/pdftexcmds-test-escape.tex
-% TDS:source/latex/oberdiek/pdftexcmds.dtx
+% TDS:tex/generic/pdftexcmds/pdftexcmds.sty
+% TDS:scripts/pdftexcmds/pdftexcmds.lua
+% TDS:doc/latex/pdftexcmds/pdftexcmds.pdf
+% TDS:source/latex/pdftexcmds/pdftexcmds.dtx
%
%<*ignore>
\begingroup
@@ -90,7 +86,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdftexcmds 2019/07/25 v0.30 Utility functions of pdfTeX for LuaTeX (HO)}
+\Msg{* Package: pdftexcmds 2019/11/24 v0.31 Utility functions of pdfTeX for LuaTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -102,10 +98,11 @@
This is a generated file.
Project: pdftexcmds
-Version: 2019/07/25 v0.30
+Version: 2019/11/24 v0.31
-Copyright (C) 2007, 2009-2011 by
- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+Copyright (C)
+ 2007, 2009-2011 Heiko Oberdiek
+ 2016-2019 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -121,7 +118,7 @@ This work has the LPPL maintenance status "maintained".
The Current Maintainers of this work are
Heiko Oberdiek and the Oberdiek Package Support Group
-https://github.com/ho-tex/oberdiek/issues
+https://github.com/ho-tex/pdftexcmds/issues
The Base Interpreter refers to any `TeX-Format',
@@ -130,9 +127,7 @@ because some files are installed in TDS:tex/generic//.
This work consists of the main source file pdftexcmds.dtx
and the derived files
pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv,
- pdftexcmds.bib, pdftexcmds-test1.tex, pdftexcmds-test2.tex,
- pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex,
- oberdiek.pdftexcmds.lua, pdftexcmds.lua.
+ pdftexcmds.lua.
\endpreamble
\let\MetaPrefix\DoubleperCent
@@ -145,16 +140,16 @@ and the derived files
\file{pdftexcmds.bib}{\from{pdftexcmds.dtx}{bib}}%
\usepreamble\defaultpreamble
\usepostamble\defaultpostamble
- \usedir{tex/generic/oberdiek}%
+ \usedir{tex/generic/pdftexcmds}%
\file{pdftexcmds.sty}{\from{pdftexcmds.dtx}{package}}%
-% \usedir{doc/latex/oberdiek/test}%
+% \usedir{doc/latex/pdftexcmds/test}%
% \file{pdftexcmds-test1.tex}{\from{pdftexcmds.dtx}{test1}}%
% \file{pdftexcmds-test2.tex}{\from{pdftexcmds.dtx}{test2}}%
% \file{pdftexcmds-test-shell.tex}{\from{pdftexcmds.dtx}{test-shell}}%
% \file{pdftexcmds-test-escape.tex}{\from{pdftexcmds.dtx}{test-escape}}%
\nopreamble
\nopostamble
-% \usedir{source/latex/oberdiek/catalogue}%
+% \usedir{source/latex/pdftexcmds/catalogue}%
% \file{pdftexcmds.xml}{\from{pdftexcmds.dtx}{catalogue}}%
}
\def\MetaPrefix{-- }
@@ -164,8 +159,7 @@ and the derived files
}
\def\currentpostamble{\defaultpostamble}%
\generate{%
- \usedir{scripts/oberdiek}%
- \file{oberdiek.pdftexcmds.lua}{\from{pdftexcmds.dtx}{lua}}%
+ \usedir{scripts/pdftexcmds}%
\file{pdftexcmds.lua}{\from{pdftexcmds.dtx}{lua}}%
}
@@ -180,7 +174,7 @@ and the derived files
\Msg{*}
\Msg{* And install the following script files:}
\Msg{*}
-\Msg{* oberdiek.pdftexcmds.lua, pdftexcmds.lua}
+\Msg{* pdftexcmds.lua}
\Msg{*}
\Msg{* To produce the documentation run the file `pdftexcmds.drv'}
\Msg{* through LaTeX.}
@@ -206,7 +200,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdftexcmds.drv}%
- [2019/07/25 v0.30 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2019/11/24 v0.31 Utility functions of pdfTeX for LuaTeX (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
@@ -244,9 +238,9 @@ and the derived files
% \GetFileInfo{pdftexcmds.drv}
%
% \title{The \xpackage{pdftexcmds} package}
-% \date{2019/07/25 v0.30}
+% \date{2019/11/24 v0.31}
% \author{Heiko Oberdiek\thanks
-% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
+% {Please report any issues at \url{https://github.com/ho-tex/pdftexcmds/issues}}}
%
% \maketitle
%
@@ -622,7 +616,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2019/07/25 v0.30 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2019/11/24 v0.31 Utility functions of pdfTeX for LuaTeX (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -705,14 +699,12 @@ and the derived files
\fi
}%
\TMP@RequirePackage{infwarerr}[2007/09/09]%
- \TMP@RequirePackage{ifluatex}[2010/03/01]%
+ \TMP@RequirePackage{iftex}[2019/11/07]%%
\TMP@RequirePackage{ltxcmds}[2010/12/02]%
- \TMP@RequirePackage{ifpdf}[2010/09/13]%
\else
\RequirePackage{infwarerr}[2007/09/09]%
- \RequirePackage{ifluatex}[2010/03/01]%
+ \RequirePackage{iftex}[2019/11/07]%
\RequirePackage{ltxcmds}[2010/12/02]%
- \RequirePackage{ifpdf}[2010/09/13]%
\fi
% \end{macrocode}
%
@@ -721,19 +713,18 @@ and the derived files
% \begin{macrocode}
\ifluatex
\else
- \@PackageInfoNoLine{pdftexcmds}{LuaTeX not detected}%
\def\pdftexcmds@nopdftex{%
- \@PackageInfoNoLine{pdftexcmds}{pdfTeX >= 1.30 not detected}%
\let\pdftexcmds@nopdftex\relax
}%
\def\pdftexcmds@temp#1{%
\begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdf#1\endcsname\relax
+ \expandafter\ifx\csname
+ \expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname\relax
\pdftexcmds@nopdftex
\else
\expandafter\def\csname pdf@#1\expandafter\endcsname
- \expandafter##\expandafter{%
- \csname pdf#1\endcsname
+ \expandafter{%
+ \csname\expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname
}%
\fi
}%
@@ -796,11 +787,12 @@ and the derived files
}%
\def\pdftexcmds@temp#1{%
\begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdf#1\endcsname\relax
+ \expandafter\ifx\csname
+ \expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname\relax
\pdftexcmds@nopdftex
\else
\expandafter\let\csname pdf@#1\expandafter\endcsname
- \csname pdf#1\endcsname
+ \csname\expandafter\ifx\csname pdf#1\endcsname\relax\else pdf\fi#1\endcsname
\fi
}%
\pdftexcmds@temp{resettimer}%
@@ -1145,20 +1137,6 @@ and the derived files
% \end{macrocode}
%
% \begin{macrocode}
-\ifnum\luatexversion<80
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname RequirePackage\endcsname\relax
- \def\TMP@RequirePackage#1[#2]{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ver@#1.sty\endcsname\relax
- \input #1.sty\relax
- \fi
- }%
- \TMP@RequirePackage{luatex-loader}[2009/04/10]%
- \else
- \RequirePackage{luatex-loader}[2009/04/10]%
- \fi
-\fi
\pdftexcmds@directlua{%
require("pdftexcmds")%
}
@@ -1178,7 +1156,7 @@ and the derived files
\fi
\fi
\begingroup
- \def\x{2019/07/25 v0.30}%
+ \def\x{2019/11/24 v0.31}%
\ltx@onelevel@sanitize\x
\edef\y{%
\pdftexcmds@directlua{%
@@ -1341,7 +1319,7 @@ and the derived files
% \begin{macrocode}
\long\def\pdf@escapestring#1{%
\directlua0{%
- oberdiek.pdftexcmds.escapestring("\luaescapestring{#1}", "byte")%
+ oberdiek.pdftexcmds.escapestring("\luaescapestring{#1}")%
}%
}
% \end{macrocode}
@@ -1585,7 +1563,7 @@ local pdftexcmds = oberdiek.pdftexcmds or {}
oberdiek.pdftexcmds = pdftexcmds
local systemexitstatus
function pdftexcmds.getversion()
- tex.write("2019/07/25 v0.30")
+ tex.write("2019/11/24 v0.31")
end
% \end{macrocode}
%
@@ -2363,17 +2341,17 @@ end
% \paragraph{Package.} This package is available on
% CTAN\footnote{\CTANpkg{pdftexcmds}}:
% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/pdftexcmds.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/pdftexcmds.pdf}] Documentation.
+% \item[\CTAN{macros/latex/contrib/pdftexcmds/pdftexcmds.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/pdftexcmds/pdftexcmds.pdf}] Documentation.
% \end{description}
%
%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% \paragraph{Bundle.} All the packages of the bundle `pdftexcmds'
% are also available in a TDS compliant ZIP archive. There
% the packages are already unpacked and the documentation files
% are generated. The files and directories obey the TDS standard.
% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/pdftexcmds.tds.zip}]
% \end{description}
% \emph{TDS} refers to the standard ``A Directory Structure
% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -2381,24 +2359,16 @@ end
%
% \subsection{Bundle installation}
%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
+% \paragraph{Unpacking.} Unpack the \xfile{pdftexcmds.tds.zip} in the
% TDS tree (also known as \xfile{texmf} tree) of your choice.
% Example (linux):
% \begin{quote}
-% |unzip oberdiek.tds.zip -d ~/texmf|
+% |unzip pdftexcmds.tds.zip -d ~/texmf|
% \end{quote}
%
% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% Check the directory \xfile{TDS:scripts/pdftexcmds/} for
% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-% |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
%
% \subsection{Package installation}
%
@@ -2415,15 +2385,10 @@ end
% \begin{quote}
% \def\t{^^A
% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-% pdftexcmds.sty & tex/generic/oberdiek/pdftexcmds.sty\\
-% oberdiek.pdftexcmds.lua & scripts/oberdiek/oberdiek.pdftexcmds.lua\\
-% pdftexcmds.lua & scripts/oberdiek/pdftexcmds.lua\\
-% pdftexcmds.pdf & doc/latex/oberdiek/pdftexcmds.pdf\\
-% test/pdftexcmds-test1.tex & doc/latex/oberdiek/test/pdftexcmds-test1.tex\\
-% test/pdftexcmds-test2.tex & doc/latex/oberdiek/test/pdftexcmds-test2.tex\\
-% test/pdftexcmds-test-shell.tex & doc/latex/oberdiek/test/pdftexcmds-test-shell.tex\\
-% test/pdftexcmds-test-escape.tex & doc/latex/oberdiek/test/pdftexcmds-test-escape.tex\\
-% pdftexcmds.dtx & source/latex/oberdiek/pdftexcmds.dtx\\
+% pdftexcmds.sty & tex/generic/pdftexcmds/pdftexcmds.sty\\
+% pdftexcmds.lua & scripts/pdftexcmds/pdftexcmds.lua\\
+% pdftexcmds.pdf & doc/latex/pdftexcmds/pdftexcmds.pdf\\
+% pdftexcmds.dtx & source/latex/pdftexcmds/pdftexcmds.dtx\\
% \end{tabular}^^A
% }^^A
% \sbox0{\t}^^A
@@ -2679,7 +2644,15 @@ end
% \end{Version}
% \begin{Version}{2019/07/25 v0.30}
% \item
-% remove uses of module function, see PR70
+% Remove uses of module function, see PR70
+% \end{Version}
+% \begin{Version}{2019/11/24 v0.31}
+% \item
+% Use \xpackage{iftex} directly rather than \xpackage{ifluatex} and \xpackage{ifpdf} wrappers.
+% \item detect \verb|\filmoddate| and other \hologo{XeTeX} commands.
+% \item Adjust \cs{pdf@escapestring} in \hologo{LuaTeX} to produce
+% the same as in \hologo{pdfTeX} in the 8bit
+% range and not drop all non ascii characters.
% \end{Version}
% \end{History}
%
diff --git a/macros/latex/contrib/pdftexcmds/pdftexcmds.pdf b/macros/latex/contrib/pdftexcmds/pdftexcmds.pdf
new file mode 100644
index 0000000000..3de8102fc2
--- /dev/null
+++ b/macros/latex/contrib/pdftexcmds/pdftexcmds.pdf
Binary files differ