diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfcolfoot/README.md | 20 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pdfcolfoot/pdfcolfoot.pdf (renamed from Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf) | bin | 322160 -> 319610 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/pdfcolfoot/pdfcolfoot.dtx (renamed from Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx) | 84 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfcolfoot/pdfcolfoot.sty (renamed from Master/texmf-dist/tex/latex/oberdiek/pdfcolfoot.sty) | 14 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 3 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc | 1 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/pdfcolfoot.tlpsrc | 0 |
8 files changed, 65 insertions, 58 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfcolfoot/README.md b/Master/texmf-dist/doc/latex/pdfcolfoot/README.md new file mode 100644 index 00000000000..30973ae3e72 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pdfcolfoot/README.md @@ -0,0 +1,20 @@ +# pdfcolfoot: using pdfTeX’s color stack for footnotes + +## Version: 2023-01-10 v1.6 + +Since version 1.40 pdfTeX supports several color stacks. This +package uses a separate color stack for footnotes that can break +across pages. + +## Copyright (C) + +* 2007, 2012 Heiko Oberdiek +* 2016-2023 Oberdiek Package Support Group + +## Github/Issues + +* https://github.com/ho-tex/pdfcolfoot/issues + + +## License +LATEX Project Public License, version 1.3c or later. diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf b/Master/texmf-dist/doc/latex/pdfcolfoot/pdfcolfoot.pdf Binary files differindex bc2bcfc34fa..8c15507e595 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf +++ b/Master/texmf-dist/doc/latex/pdfcolfoot/pdfcolfoot.pdf diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx b/Master/texmf-dist/source/latex/pdfcolfoot/pdfcolfoot.dtx index 04aaf31a3ae..cbdd576120d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx +++ b/Master/texmf-dist/source/latex/pdfcolfoot/pdfcolfoot.dtx @@ -1,13 +1,13 @@ % \iffalse meta-comment % % File: pdfcolfoot.dtx -% Version: 2016/05/16 v1.3 +% Version: 2023-01-10 v1.4 % Info: Color stack for footnotes with pdfTeX % % Copyright (C) % 2007, 2012 Heiko Oberdiek -% 2016-2019 Oberdiek Package Support Group -% https://github.com/ho-tex/oberdiek/issues +% 2016-2023 Oberdiek Package Support Group +% https://github.com/ho-tex/pdfcolfoot/issues % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -23,16 +23,15 @@ % % 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/pdfcolfoot/issues % % This work consists of the main source file pdfcolfoot.dtx % and the derived files -% pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv, -% pdfcolfoot-test1.tex. +% pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv % % Distribution: -% CTAN:macros/latex/contrib/oberdiek/pdfcolfoot.dtx -% CTAN:macros/latex/contrib/oberdiek/pdfcolfoot.pdf +% CTAN:macros/latex/contrib/pdfcolfoot/pdfcolfoot.dtx +% CTAN:macros/latex/contrib/pdfcolfoot/pdfcolfoot.pdf % % Unpacking: % (a) If pdfcolfoot.ins is present: @@ -61,9 +60,9 @@ % pdflatex pdfcolfoot.dtx % % Installation: -% TDS:tex/latex/oberdiek/pdfcolfoot.sty -% TDS:doc/latex/oberdiek/pdfcolfoot.pdf -% TDS:source/latex/oberdiek/pdfcolfoot.dtx +% TDS:tex/latex/pdfcolfoot/pdfcolfoot.sty +% TDS:doc/latex/pdfcolfoot/pdfcolfoot.pdf +% TDS:source/latex/pdfcolfoot/pdfcolfoot.dtx % %<*ignore> \begingroup @@ -80,7 +79,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdfcolfoot 2016/05/16 v1.3 Color stack for footnotes with pdfTeX (HO)} +\Msg{* Package: pdfcolfoot 2023-01-10 v1.4 Color stack for footnotes with pdfTeX (HO)} \Msg{************************************************************************} \keepsilent @@ -92,11 +91,11 @@ This is a generated file. Project: pdfcolfoot -Version: 2016/05/16 v1.3 +Version: 2023-01-10 v1.4 Copyright (C) 2007, 2012 Heiko Oberdiek - 2016-2019 Oberdiek Package Support Group + 2016-2023 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -112,13 +111,12 @@ 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/pdfcolfoot/issues This work consists of the main source file pdfcolfoot.dtx and the derived files - pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv, - pdfcolfoot-test1.tex. + pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv \endpreamble \let\MetaPrefix\DoubleperCent @@ -128,8 +126,6 @@ and the derived files \file{pdfcolfoot.drv}{\from{pdfcolfoot.dtx}{driver}}% \usedir{tex/latex/oberdiek}% \file{pdfcolfoot.sty}{\from{pdfcolfoot.dtx}{package}}% -% \usedir{doc/latex/oberdiek/test}% -% \file{pdfcolfoot-test1.tex}{\from{pdfcolfoot.dtx}{test1}}% } \catcode32=13\relax% active space @@ -156,7 +152,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdfcolfoot.drv}% - [2016/05/16 v1.3 Color stack for footnotes with pdfTeX (HO)]% + [2023-01-10 v1.4 Color stack for footnotes with pdfTeX (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -170,9 +166,9 @@ and the derived files % \GetFileInfo{pdfcolfoot.drv} % % \title{The \xpackage{pdfcolfoot} package} -% \date{2016/05/16 v1.3} +% \date{2023-01-10 v1.4} % \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/pdfcolfoot/issues}}} % % \maketitle % @@ -270,7 +266,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolfoot}% - [2016/05/16 v1.3 Color stack for footnotes with pdfTeX (HO)]% + [2023-01-10 v1.4 Color stack for footnotes with pdfTeX (HO)]% % \end{macrocode} % % \subsection{Load package \xpackage{pdfcol}} @@ -317,7 +313,9 @@ and the derived files \else \pdfcolfoot@switch \fi + \color@begingroup #1% + \color@endgroup }% }% } @@ -489,33 +487,15 @@ and the derived files % \paragraph{Package.} This package is available on % CTAN\footnote{\CTANpkg{pdfcolfoot}}: % \begin{description} -% \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolfoot.dtx}] The source file. -% \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolfoot.pdf}] Documentation. +% \item[\CTAN{macros/latex/contrib/pdfcolfoot/pdfcolfoot.dtx}] The source file. +% \item[\CTAN{macros/latex/contrib/pdfcolfoot/pdfcolfoot.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'' (\CTANpkg{tds}). 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} -% % \subsection{Package installation} -% +% +% The package should be installed with the package manager of your \TeX~system. +% If for some reason a manual installation is needed follow the following instructions. +% % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting % \docstrip\ archive. The files are extracted by running the % \xfile{.dtx} through \plainTeX: @@ -529,9 +509,9 @@ and the derived files % \begin{quote} % \def\t{^^A % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} -% pdfcolfoot.sty & tex/latex/oberdiek/pdfcolfoot.sty\\ -% pdfcolfoot.pdf & doc/latex/oberdiek/pdfcolfoot.pdf\\ -% pdfcolfoot.dtx & source/latex/oberdiek/pdfcolfoot.dtx\\ +% pdfcolfoot.sty & tex/latex/pdfcolfoot/pdfcolfoot.sty\\ +% pdfcolfoot.pdf & doc/latex/pdfcolfoot/pdfcolfoot.pdf\\ +% pdfcolfoot.dtx & source/latex/pdfcolfoot/pdfcolfoot.dtx\\ % \end{tabular}^^A % }^^A % \sbox0{\t}^^A @@ -670,6 +650,10 @@ and the derived files % \item % Documentation updates. % \end{Version} +% \begin{Version}{2023-01-10 v1.4} +% \item Added a group to avoid that the wrong color +% stack is reset after the footnote. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfcolfoot.sty b/Master/texmf-dist/tex/latex/pdfcolfoot/pdfcolfoot.sty index 4864dd9da99..7bc3e049b05 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pdfcolfoot.sty +++ b/Master/texmf-dist/tex/latex/pdfcolfoot/pdfcolfoot.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: pdfcolfoot -%% Version: 2016/05/16 v1.3 +%% Version: 2023-01-10 v1.4 %% %% Copyright (C) %% 2007, 2012 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2023 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -29,17 +29,15 @@ %% %% 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/pdfcolfoot/issues %% %% This work consists of the main source file pdfcolfoot.dtx %% and the derived files -%% pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv, -%% pdfcolfoot-test1.tex. +%% pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfcolfoot}% - [2016/05/16 v1.3 Color stack for footnotes with pdfTeX (HO)]% + [2023-01-10 v1.4 Color stack for footnotes with pdfTeX (HO)]% \RequirePackage{pdfcol}[2007/09/09] \ifpdfcolAvailable \else @@ -61,7 +59,9 @@ \else \pdfcolfoot@switch \fi + \color@begingroup #1% + \color@endgroup }% }% } diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 27cfc36a884..5fb024da711 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -615,7 +615,8 @@ my @TLP_working = qw( patch patchcmd patgen2-tutorial path pauldoc pawpict pax pbalance pbibtex-base pbox pb-diagram pbibtex-manual pbsheet pdf14 - pdf-trans pdfarticle pdfbook2 pdfcol pdfcolmk pdfcomment pdfcprot pdfcrop + pdf-trans pdfarticle pdfbook2 + pdfcol pdfcolfoot pdfcolmk pdfcomment pdfcprot pdfcrop pdfescape pdfextra pdfjam pdflatexpicscale pdflscape pdfmanagement-testphase pdfmarginpar pdfmsym pdfoverlay diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 0f8f0582339..a66c2b68043 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3207,6 +3207,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'papermas' => 'tex', 'pauldoc' => 'latex', # requires interaction 'pdfcol' => 'etex', + 'pdfcolfoot' => 'etex', 'pdftexcmds' => 'etex', 'picture' => 'etex', 'placeat' => 'luatex', diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc index 578f98db3cf..ce0541c8cbe 100644 --- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc @@ -53,6 +53,7 @@ depend ms depend newfloat depend ntgclass depend parskip +depend pdfcolfoot depend pdflscape depend pdfmanagement-testphase depend pdfpages diff --git a/Master/tlpkg/tlpsrc/pdfcolfoot.tlpsrc b/Master/tlpkg/tlpsrc/pdfcolfoot.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/pdfcolfoot.tlpsrc |