From a8098e7a183f670ff9b54d26bfc95b819c184fdc Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 7 Jul 2024 03:01:19 +0000 Subject: CTAN sync 202407070301 --- macros/latex/contrib/colortbl/colortbl-DE.pdf | Bin 346722 -> 346756 bytes macros/latex/contrib/colortbl/colortbl.dtx | 34 +++++- macros/latex/contrib/colortbl/colortbl.pdf | Bin 312925 -> 313437 bytes macros/latex/contrib/sepfootnotes/README | 7 +- macros/latex/contrib/sepfootnotes/sepfootnotes.pdf | Bin 218406 -> 223965 bytes macros/latex/contrib/sepfootnotes/sepfootnotes.sty | 132 +++++++++++++++------ macros/latex/contrib/sepfootnotes/sepfootnotes.tex | 16 +-- 7 files changed, 136 insertions(+), 53 deletions(-) (limited to 'macros') diff --git a/macros/latex/contrib/colortbl/colortbl-DE.pdf b/macros/latex/contrib/colortbl/colortbl-DE.pdf index 57a1653f9c..879d4b3f5b 100644 Binary files a/macros/latex/contrib/colortbl/colortbl-DE.pdf and b/macros/latex/contrib/colortbl/colortbl-DE.pdf differ diff --git a/macros/latex/contrib/colortbl/colortbl.dtx b/macros/latex/contrib/colortbl/colortbl.dtx index 076c69643a..8e5f1e8be1 100644 --- a/macros/latex/contrib/colortbl/colortbl.dtx +++ b/macros/latex/contrib/colortbl/colortbl.dtx @@ -15,7 +15,7 @@ %\ProvidesFile{colortbl.drv} % \fi % \ProvidesFile{colortbl.dtx} - [2024/05/26 v1.0h Color table columns (DPC)] + [2024/07/06 v1.0i Color table columns (DPC)] % % \iffalse %<*driver> @@ -1505,9 +1505,21 @@ % % % longtable support. +% \changes{v1.0i}{2024/07/06}{tagging code adjusments for longtable hline} +% \begin{macrocode} +\ExplSyntaxOn +% \end{macrocode} +% +% Stub tag support if tagging has not been enabled. +% \begin{macrocode} +\cs_if_exist:NF\tag_mc_begin:n{ + \cs_new:Npn\tag_mc_begin:n#1{} + \cs_new:Npn\tag_mc_end:{} +} +% \end{macrocode} +% % \begin{macrocode} \AtBeginDocument{ - \ifx\longtable\@undefined\else \def\LT@@hline{% \ifx\LT@next\hline \global\let\LT@next\@gobble @@ -1517,7 +1529,10 @@ \else \gdef\CT@LT@sep{% \multispan\LT@cols{% - \CT@drsc@\leaders\hrule\@height\doublerulesep\hfill}\cr}% + \tag_mc_begin:n{artifact} + \CT@drsc@\leaders\hrule\@height\doublerulesep\hfill + \tag_mc_end: \int_gdecr:N \g__tbl_row_int + }\cr}% \fi \else \global\let\LT@next\empty @@ -1526,13 +1541,20 @@ \fi \ifnum0=`{\fi}% \multispan\LT@cols - {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr + {\tag_mc_begin:n{artifact} + \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill + \tag_mc_end: \int_gdecr:N \g__tbl_row_int + }\cr \CT@LT@sep \multispan\LT@cols - {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}\cr + {\tag_mc_begin:n{artifact} + \CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill + \tag_mc_end: \int_gdecr:N \g__tbl_row_int + }\cr \noalign{\penalty\@M}% \LT@next} - \fi} + } +\ExplSyntaxOff % \end{macrocode} % % diff --git a/macros/latex/contrib/colortbl/colortbl.pdf b/macros/latex/contrib/colortbl/colortbl.pdf index 9a2299528d..6ebe2525c3 100644 Binary files a/macros/latex/contrib/colortbl/colortbl.pdf and b/macros/latex/contrib/colortbl/colortbl.pdf differ diff --git a/macros/latex/contrib/sepfootnotes/README b/macros/latex/contrib/sepfootnotes/README index e0f9ac9aac..2a507a1da4 100644 --- a/macros/latex/contrib/sepfootnotes/README +++ b/macros/latex/contrib/sepfootnotes/README @@ -5,8 +5,11 @@ This package supports footnotes and endnotes from separate files. This is achieved with commands \sepfootnotecontent and \sepfootnote; the former defines the content of a note, while the latter typesets that note. +2024/07/05 v0.3d + * Package options after: Allow \sepfootnotecontent after \sepfootnote + 2016/07/18 v0.3c - * Package options Note definitions may take global scope + * Package options global: Note definitions may take global scope 2014/07/22 v0.3b * Documentation Minor formatting changes to page 4 @@ -41,7 +44,7 @@ Usage: *See sepfootnotes.pdf -------------------------------------------------------------------------------- -Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima +Copyright (C) 2013-2024 Eduardo C. Lourenço de Lima This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html diff --git a/macros/latex/contrib/sepfootnotes/sepfootnotes.pdf b/macros/latex/contrib/sepfootnotes/sepfootnotes.pdf index 0cb449cb21..0246b086b5 100644 Binary files a/macros/latex/contrib/sepfootnotes/sepfootnotes.pdf and b/macros/latex/contrib/sepfootnotes/sepfootnotes.pdf differ diff --git a/macros/latex/contrib/sepfootnotes/sepfootnotes.sty b/macros/latex/contrib/sepfootnotes/sepfootnotes.sty index d953d30022..f99b9770c0 100644 --- a/macros/latex/contrib/sepfootnotes/sepfootnotes.sty +++ b/macros/latex/contrib/sepfootnotes/sepfootnotes.sty @@ -1,4 +1,4 @@ -%% Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima +%% Copyright (C) 2013-2024 Eduardo C. Lourenço de Lima %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -11,19 +11,23 @@ %% version 2005/12/01 or later. %% \NeedsTeXFormat {LaTeX2e} [1996/06/01] -\ProvidesPackage {sepfootnotes} [2016/07/18 v0.3c Footnotes in separate file] +\ProvidesPackage {sepfootnotes} [2024/07/05 v0.3d Footnotes in separate file] \newcommand\sep@packagename{sepfootnotes} +%{% options + \DeclareOption {quiet} {\sep@opt@quiettrue} \DeclareOption {warn} {\sep@opt@warntrue} \DeclareOption {error} {\sep@opt@errortrue} \DeclareOption {global} {\sep@opt@globaltrue} +\DeclareOption {after} {\sep@opt@aftertrue} \newif \ifsep@opt@quiet \newif \ifsep@opt@warn \newif \ifsep@opt@error \newif \ifsep@opt@global +\newif \ifsep@opt@after \sep@opt@warntrue @@ -38,10 +42,10 @@ \sep@opt@warnfalse \fi +%}% +%{% public -% ********************************* Public ************************************ - -% ==================== shared by footnotes and endnotes ======================= +%{% footnotes and endnotes \newcommand\sep@new [1] {\newcounter{#1note}% @@ -52,7 +56,8 @@ \expandafter\newcommand\csname #1quicknote\endcsname [1] {\sep@namereplace {#1} {sepfootnotes@tmp@quick} {##1}\csname #1note\endcsname{sepfootnotes@tmp@quick}}\relax } -% -------------------------------- footnotes ---------------------------------- +%}% +%{% footnotes \newcommand\newfootnotes{\@ifstar\sep@newfootnotesfree\sep@newfootnotes} @@ -73,7 +78,8 @@ \@addtoreset {#2note} {#1}% \expandafter\renewcommand\csname the#2mark\endcsname {\fnsymbol {#2note}}} -% -------------------------------- endnotes ----------------------------------- +%}% +%{% endnotes \newcommand\newendnotes [1] {\sep@new {#1}% @@ -88,8 +94,8 @@ \expandafter\newcommand\csname #1notesize\endcsname {\footnotesize}% \newenvironment {#1notes} {\csname #1notesize\endcsname\setlength\parskip\footnotesep} {}} - -% ------------------------------ commentnotes -------------------------------- +%}% +%{% commentnotes \newcommand\newcommentnotes [1] {\newfootnotes*{#1}\relax @@ -107,62 +113,114 @@ \@addtoreset {#2note} {#1}\relax \expandafter\renewcommand\csname the#2mark\endcsname {\fnsymbol {#2note}}} -% ********************************* Private *********************************** +%}% + +%}% +%{% private -% ---------------------------------- files ------------------------------------ +%{% files \newcommand\sep@filename [1] {\jobname.ent-#1} \newcommand\sep@openout [1] {\expandafter \newwrite\csname sep@fileout#1\endcsname\immediate\expandafter\openout\csname sep@fileout#1\endcsname=\sep@filename#1\relax} \newcommand\sep@write [2] {\immediate \write\csname sep@fileout#1\endcsname {#2}} \newcommand\sep@close [1] {\immediate\expandafter\closeout\csname sep@fileout#1\endcsname\relax} -% ---------------------------------- table ------------------------------------ +%}% +%{% names + +%{% \sep@nameuse \newcommand\sep@nameuse [2] {\@ifundefined{sepfootnotes@text@#1@#2} - {\ifsep@opt@error - \PackageError {\sep@packagename} {`#2' has not been assigned a content} - {`#2' has not been assigned a content.\MessageBreak - Solution: Define `#2'\MessageBreak - Try: \@backslashchar #1notecontent{#2}{}}\relax - \fi - \ifsep@opt@warn - \PackageWarning {\sep@packagename} {`#2' has not been assigned a content}\relax - \fi} + {\sep@warning@undefined{#1}{#2}} {\@nameuse{sepfootnotes@text@#1@#2}}} +%}% +%{% \sep@namedef + \newcommand\sep@namedef [3] -{\@ifundefined{sepfootnotes@text@#1@#2} +{\ifsep@opt@after\sep@namereplace{#1}{#2}{#3}\else + \@ifundefined{sepfootnotes@text@#1@#2} {\ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}} - {\ifsep@opt@error - \PackageError {\sep@packagename} {`#2' is already in use} - {`#2' is already in use.\MessageBreak - Solution: Use another key.\MessageBreak - Try: \@backslashchar #1notecontent{}{}}\relax - \fi - \ifsep@opt@warn - \PackageWarning {\sep@packagename} {`#2' is already in use} - \fi}} + {\sep@warning@already{#1}{#2}}\fi} + +%}% +%{% \sep@namereplace + +\newcommand\sep@namereplace [3] +{% + \ifsep@opt@after + \global\@namedef{sepfootnotes@text@#1@#2}{#3}% + \write\@auxout{\expandafter\unexpanded\expandafter{\global\@namedef {sepfootnotes@text@#1@#2}{#3}}}% + \else + \ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}% + \fi +} + +%}% + +%{% \sep@warning@undefined + +\newcommand \sep@warning@undefined [2] +{\ifsep@opt@error + \PackageError + {\sep@packagename} + {`#2' has not been assigned a content} + {`#2' has not been assigned a content.\MessageBreak + Solution: Define `#2'\MessageBreak + Try: \@backslashchar #1notecontent{#2}{}}% + \fi + \ifsep@opt@warn + \PackageWarning + {\sep@packagename} + {`#2' has not been assigned a content}% + \fi +} -\newcommand\sep@namereplace [3] {\ifsep@opt@global\global\fi\@namedef{sepfootnotes@text@#1@#2}{#3}} +%}% +%{% \sep@warning@already + +\newcommand \sep@warning@already [2] +{\ifsep@opt@error + \PackageError + {\sep@packagename} + {`#2' is already in use} + {`#2' is already in use.\MessageBreak + Solution: Use another key.\MessageBreak + Try: \@backslashchar #1notecontent{}{}}% + \fi + \ifsep@opt@warn + \PackageWarning + {\sep@packagename} + {`#2' is already in use}% + \fi +} -% ---------------------------------- marks ------------------------------------ +%}% + +%}% +%{% marks \newcommand\sep@markset [1] {\protected@xdef\@thefnmark{\csname the#1mark\endcsname}} \newcommand\sep@mark [2] {\stepcounter {#1note}\sep@markset {#1}\@footnotemark} -% ---------------------- cross-references and counters ------------------------ +%}% +%{% cross-references and counters \newcommand\sep@refsetcounter [2] {\setcounter{#1}{#2}\protected@edef\@currentlabel{\csname p@#1\endcsname\csname the#1\endcsname}} \newcommand\sep@refstepcounter [1] {\stepcounter {#1}\protected@edef\@currentlabel{\csname p@#1\endcsname\csname the#1\endcsname}} -% ********************************* Default *********************************** +%}% + +%}% +%{% default -% ------------------------- footnotes: \sepfootnote --------------------------- +%% The default \sepfootnote apparatus relies on \footnote -%% Default: The default \sepfootnote family relies on \footnote \newfootnotes{sepfoot} +%}% + \endinput %% %% End of file `sepfootnotes.sty'. diff --git a/macros/latex/contrib/sepfootnotes/sepfootnotes.tex b/macros/latex/contrib/sepfootnotes/sepfootnotes.tex index 4000f00fad..f73370349a 100644 --- a/macros/latex/contrib/sepfootnotes/sepfootnotes.tex +++ b/macros/latex/contrib/sepfootnotes/sepfootnotes.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2013-2016 Eduardo C. Lourenço de Lima +% Copyright (C) 2013-2024 Eduardo C. Lourenço de Lima % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -44,11 +44,11 @@ {\begin{center}\begin{minipage}[t]{0.5\linewidth}} {\end{minipage}\end{center}} \newcommand\TODO{\texttt{Todo:}} -\newcommand\fileversion{0.3c} -\newcommand\filedate{July 18, 2016} +\newcommand\fileversion{0.3d} +\newcommand\filedate{July 5, 2024} \begin{document} \title{The \textsf{\color{myblue} sepfootnotes} package,\thanks{This document corresponds to \textsf{sepfootnotes}~\fileversion, dated~\filedate. -I am grateful to Michael Sellhoff, Sam Foster, Mats, and David Carlisle for their valuable feedback on \texttt{sepfootnotes} and to Dan Luecking for the basic idea implemented in this package.}\\{or a footnote to Plato}} +I am grateful to Michael Sellhoff, Sam Foster, Mats, David Carlisle, and schtandard for their valuable feedback on \texttt{sepfootnotes} and to Dan Luecking for the basic idea implemented in this package.}\\{or a footnote to Plato}} \author{Eduardo C. Louren\c{c}o de Lima \\ \texttt{elourenco@phi.pro.br}} \maketitle @@ -59,9 +59,9 @@ I am grateful to Michael Sellhoff, Sam Foster, Mats, and David Carlisle for thei Standard |\footnote| and |\endnote| both take a note as a mandatory argument. Because notes have to be embedded in the paragraph to which they refer, sentences are often split up into two\footnote {This is precisely what this footnote does to the first paragraph of this document. There are more than thirty words between `two' and `or more' in the code of an otherwise short paragraph.} or more parts. Consequently, footnotes and endnotes may disrupt the flow of reading and editing {\LaTeX} prose.\footnote {In a posting to \texttt{texhax.tug.org} in April 2010, someone complained that using footnotes ``tends to disrupt the flow of the document on the screen and makes editing the text itself harder'', and asked about the possibility of ``putting all of the footnotes in a separate file''~\cite{Nicholas Cole}. Another user, back in 2004, remarked that the ``only thing I missed about word processors was the ability to keep footnote text at the bottom of the page, or in a separate window. I often have extensive footnotes, and don't want them cluttering up my main body text when I'm composing''~\cite{Luecking}.} This can be an issue for those who make extensive use of notes, such as philosophers and people from the humanities in general. - The |sepfootnotes| package gets around this inconvenience by separating note input from usage. That is, it provides a command to define what a particular note says, and another command to insert that note later on in the document. + The |sepfootnotes| package gets around this inconvenience by separating note input from usage. That is, it provides a command to define what a particular note says, and another command to insert that note in the document. - Note definitions may be grouped together---in no particular order---in the preamble, at the beginning of chapters or sections, right before a paragraph, or even in a \emph{separate file}. In that way, the main body is less cluttered. + Note definitions may be grouped together---in no particular order---in the preamble, at the beginning of chapters or sections, in a separate file, or even right after a paragraph. In that way, the main body is less cluttered. You may use |sepfootnotes| and standard |\footnote| simultaneously; the same goes for |\footcite| from |biblatex|. @@ -273,10 +273,10 @@ Default:\footnote{Adapted from the \texttt{endnotes} package.} \section {Package options} \begin{list}{}{} -\item[|warn|] Print warning messages. (Default.) +\item[|after|] (experimental) Allow |\sepfootnotecontent| after |\sepfootnote|. Must compile twice. Implies |global|. See below. +\item[|global|] Notes defined within environments and groups take global scope and become available throughout, as if they were defined in the preamble. \item[|error|] Print warning messages, halt, and wait for user input. \item[|quiet|] Suppress warning and error messages. -\item[|global|] Notes defined within environments and groups take global scope and become available throughout, as if they were defined in the preamble. \end{list} \section{Examples} -- cgit v1.2.3