diff options
Diffstat (limited to 'macros/latex-dev/required')
121 files changed, 703 insertions, 240 deletions
diff --git a/macros/latex-dev/required/amsmath/README.md b/macros/latex-dev/required/amsmath/README.md index e8cefa4d07..acf256c850 100644 --- a/macros/latex-dev/required/amsmath/README.md +++ b/macros/latex-dev/required/amsmath/README.md @@ -1,7 +1,7 @@ The amsmath bundle for LaTeX ============================ -Release 2024-06-01 pre-release 2 +Release 2024-11-01 pre-release 0 Overview -------- diff --git a/macros/latex-dev/required/amsmath/ams-external.txt b/macros/latex-dev/required/amsmath/ams-external.txt index fa2dbea556..69f5689c15 100644 --- a/macros/latex-dev/required/amsmath/ams-external.txt +++ b/macros/latex-dev/required/amsmath/ams-external.txt @@ -60,7 +60,6 @@ \Rightarrow \Tilde \Umathaccent -\Umathcar \Umathchar \Umathcharnumdef \Umathcode diff --git a/macros/latex-dev/required/amsmath/amsbsy.pdf b/macros/latex-dev/required/amsmath/amsbsy.pdf Binary files differindex 7ba7e970ee..98414b672d 100644 --- a/macros/latex-dev/required/amsmath/amsbsy.pdf +++ b/macros/latex-dev/required/amsmath/amsbsy.pdf diff --git a/macros/latex-dev/required/amsmath/amscd.pdf b/macros/latex-dev/required/amsmath/amscd.pdf Binary files differindex 9e7064f446..9f6494bb8e 100644 --- a/macros/latex-dev/required/amsmath/amscd.pdf +++ b/macros/latex-dev/required/amsmath/amscd.pdf diff --git a/macros/latex-dev/required/amsmath/amsgen.pdf b/macros/latex-dev/required/amsmath/amsgen.pdf Binary files differindex 145aa1486a..d67090a444 100644 --- a/macros/latex-dev/required/amsmath/amsgen.pdf +++ b/macros/latex-dev/required/amsmath/amsgen.pdf diff --git a/macros/latex-dev/required/amsmath/amsldoc.pdf b/macros/latex-dev/required/amsmath/amsldoc.pdf Binary files differindex ec0449e096..e615a52dc4 100644 --- a/macros/latex-dev/required/amsmath/amsldoc.pdf +++ b/macros/latex-dev/required/amsmath/amsldoc.pdf diff --git a/macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty b/macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty index ab45172a32..ca5ac506fb 100644 --- a/macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty +++ b/macros/latex-dev/required/amsmath/amsmath-2018-12-01.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `amsmath.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `amsmath.sty', %% generated with the docstrip utility. %% @@ -517,7 +521,7 @@ Foreign command \@backslashchar#1;\MessageBreak \else % \not \mathxxx \@xp\Umathch@\meaning@"0"\Umathch@ \ifgtest@ % if \Umathchar - \else % else not \Umathcar + \else % else not \Umathchar \@xp\macro@\meaning@@\macro@ \ifgtest@ % if macro test \@xp\not@\meaning@\not@ diff --git a/macros/latex-dev/required/amsmath/amsmath.dtx b/macros/latex-dev/required/amsmath/amsmath.dtx index d0ed131811..ec44957a89 100644 --- a/macros/latex-dev/required/amsmath/amsmath.dtx +++ b/macros/latex-dev/required/amsmath/amsmath.dtx @@ -76,17 +76,16 @@ Bug reports can be opened (category \texttt{#1}) at\\% [1994/12/01]% LaTeX date must be December 1994 or later % \end{macrocode} % -% Providing a rollback to earlier version(s) +% Providing a rollback to earlier version(s). Anything prior to +% 2018 we attempt to fulfill by using the version from 2018. % \begin{macrocode} -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} -% +\DeclareRelease{}{1994-06-01}{amsmath-2018-12-01.sty} \DeclareRelease{}{2018-12-01}{amsmath-2018-12-01.sty} \DeclareCurrentRelease{}{2019-04-01} % \end{macrocode} % % \begin{macrocode} -\ProvidesPackage{amsmath}[2024/03/13 v2.17p AMS math features] +\ProvidesPackage{amsmath}[2024/05/23 v2.17q AMS math features] % \end{macrocode} % % \section{Catcode defenses} @@ -1162,7 +1161,7 @@ Foreign command \@backslashchar#1;\MessageBreak % \begin{macrocode} \@xp\Umathch@\meaning@"0"\Umathch@ \ifgtest@ % if \Umathchar - \else % else not \Umathcar + \else % else not \Umathchar % \end{macrocode} % \begin{macrocode} \@xp\macro@\meaning@@\macro@ diff --git a/macros/latex-dev/required/amsmath/amsmath.pdf b/macros/latex-dev/required/amsmath/amsmath.pdf Binary files differindex fde4b6a38f..2ae7c81905 100644 --- a/macros/latex-dev/required/amsmath/amsmath.pdf +++ b/macros/latex-dev/required/amsmath/amsmath.pdf diff --git a/macros/latex-dev/required/amsmath/amsopn.pdf b/macros/latex-dev/required/amsmath/amsopn.pdf Binary files differindex 978b9d6a70..6f1b3c0331 100644 --- a/macros/latex-dev/required/amsmath/amsopn.pdf +++ b/macros/latex-dev/required/amsmath/amsopn.pdf diff --git a/macros/latex-dev/required/amsmath/amstext.pdf b/macros/latex-dev/required/amsmath/amstext.pdf Binary files differindex 48ff030166..37ad4cc7fa 100644 --- a/macros/latex-dev/required/amsmath/amstext.pdf +++ b/macros/latex-dev/required/amsmath/amstext.pdf diff --git a/macros/latex-dev/required/amsmath/amsxtra.pdf b/macros/latex-dev/required/amsmath/amsxtra.pdf Binary files differindex a96c13d257..af44bc5e9b 100644 --- a/macros/latex-dev/required/amsmath/amsxtra.pdf +++ b/macros/latex-dev/required/amsmath/amsxtra.pdf diff --git a/macros/latex-dev/required/amsmath/changes.txt b/macros/latex-dev/required/amsmath/changes.txt index a15eab5bbf..588e7d36d0 100644 --- a/macros/latex-dev/required/amsmath/changes.txt +++ b/macros/latex-dev/required/amsmath/changes.txt @@ -1,13 +1,23 @@ +================================================================================ +All changes above are only part of the development branch for the next release. +================================================================================ + +######################### +# 2023-11-01 Release +######################### + +2024-05-23 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * amsmath.dtx: + Do not error with "suspicous date" when rolling back to + early years of LaTeX2e (gh/1336) + 2024-03-11 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * amsmath.dtx (subsection{The \env{gather} environment}): Reset \lineht@ to avoid that this is incorrectly picked up by a following environment, such as align. (gh/1289) -================================================================================ -All changes above are only part of the development branch for the next release. -================================================================================ - ######################### # 2023-11-01 Release ######################### diff --git a/macros/latex-dev/required/amsmath/subeqn.pdf b/macros/latex-dev/required/amsmath/subeqn.pdf Binary files differindex 0f7d593343..54f6fe9385 100644 --- a/macros/latex-dev/required/amsmath/subeqn.pdf +++ b/macros/latex-dev/required/amsmath/subeqn.pdf diff --git a/macros/latex-dev/required/amsmath/technote.pdf b/macros/latex-dev/required/amsmath/technote.pdf Binary files differindex 6f70cc885c..6526568bda 100644 --- a/macros/latex-dev/required/amsmath/technote.pdf +++ b/macros/latex-dev/required/amsmath/technote.pdf diff --git a/macros/latex-dev/required/amsmath/testmath.pdf b/macros/latex-dev/required/amsmath/testmath.pdf Binary files differindex 151d3d2920..e1ce7c6acd 100644 --- a/macros/latex-dev/required/amsmath/testmath.pdf +++ b/macros/latex-dev/required/amsmath/testmath.pdf diff --git a/macros/latex-dev/required/graphics/README.md b/macros/latex-dev/required/graphics/README.md index df1e890c5a..b622f8fbfd 100644 --- a/macros/latex-dev/required/graphics/README.md +++ b/macros/latex-dev/required/graphics/README.md @@ -1,7 +1,7 @@ The LaTeX `graphics` bundle =========================== -Release 2024-06-01 pre-release 0 +Release 2024-11-01 pre-release 0 Overview -------- @@ -61,4 +61,4 @@ of the package. ----- -<p>Copyright (C) 1993-2023 The LaTeX Project <br /> +<p>Copyright (C) 1993-2024 The LaTeX Project <br /> diff --git a/macros/latex-dev/required/graphics/changes.txt b/macros/latex-dev/required/graphics/changes.txt index 55dde0358f..face90b342 100644 --- a/macros/latex-dev/required/graphics/changes.txt +++ b/macros/latex-dev/required/graphics/changes.txt @@ -9,6 +9,20 @@ All changes above are only part of the development branch for the next release. ================================================================================ ######################### +# 2023-11-01 Release +######################### + +2024-05-23 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * graphics.dtx: + Do not error with "suspicious date" when rolling back to + early years of LaTeX2e (gh/1336) + +2024-04-28 David Carlisle <David.Carlisle@latex-project.org> + + * grfguide.tex: add \resizebox* example for gh/1339 + +######################### # 2022-11-01 Release ######################### diff --git a/macros/latex-dev/required/graphics/color.dtx b/macros/latex-dev/required/graphics/color.dtx index bd37971470..130a960d09 100644 --- a/macros/latex-dev/required/graphics/color.dtx +++ b/macros/latex-dev/required/graphics/color.dtx @@ -2,7 +2,7 @@ % \iffalse % %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005-2023 LaTeX Project +%% Copyright (C) 2005-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -21,7 +21,7 @@ %<driver> \ProvidesFile{color.drv} % \fi % \ProvidesFile{color.dtx} - [2022/01/06 v1.3d Standard LaTeX Color (DPC)] + [2024/01/14 v1.3d Standard LaTeX Color (DPC)] % % \iffalse %<*driver> @@ -168,7 +168,7 @@ % % \begin{option}{dvips} % \begin{option}{xdvi} -% Tom Rokicki's dvips driver, and the X Windows previewer, xdvi which uses +% Tom Rokicki's dvips driver, and the X Windows previewer, xdvi, which uses % (a subset of) the same |\specials|. % \begin{macrocode} \DeclareOption{dvips}{\def\Gin@driver{dvips.def}% @@ -248,7 +248,7 @@ % \changes{v0.3k}{1995/09/07} % {Merge dviwindo and dvipsone options} % The drivers of the Y\&Y \TeX\ system. -% (Which use the same |\specials|). +% (Which use the same |\specials|.) % \begin{macrocode} \DeclareOption{dvipsone}{\def\Gin@driver{dvipsone.def}} \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}} @@ -360,7 +360,7 @@ % The |dvipsnames| option predeclares all the names in the colour % prologue of dvips. The |dvips| option automatically implies % |dvipsnames| unless this choice is overruled with the |nodvipsnames| -% option. For other drivers, eg |textures| you may use this option to +% option. For other drivers, eg |textures|, you may use this option to % explicitly request that these names be declared. % \begin{macrocode} \DeclareOption{dvipsnames}{\def\c@lor@namefile{dvipsnam.def}} @@ -371,7 +371,7 @@ % % \begin{option}{usenames} % The |usenames| option modifies the behaviour of |\DefineNamedColor| -% So that it declares the same name as a ```user's colour'' for use in +% so that it declares the same name as a ``user's colour'' for use in % a |\color| command, as well as a name in the |named| colour model. % The normal behaviour is just to declare the name in the named colour % model. @@ -530,7 +530,7 @@ % |\color| or |\textcolor| commands to refer to a colour specified by % \emph{colour-spec} in the colour model \emph{model}. % -% |\definecolor| associates the \emph{name} the to a colour in +% |\definecolor| associates the \emph{name} to a colour in % \emph{model}. So |\color{|\emph{name}|}| would check \emph{name} % then issue a |\special| for the colour model \emph{model}. % @@ -579,12 +579,12 @@ % names. % % The `color1' drivers (dvips) currently ignore the specification of -% the colour, and once a name is defined, just put the colour name in -% the dvi file. For dvips, The header file \texttt{color.pro} is used to +% the colour and, once a name is defined, just put the colour name in +% the dvi file. For dvips, the header file \texttt{color.pro} is used to % give the cmyk equivalents of the names. % % The `color2' drivers (textures) use a special postscript operator -% that takes both the name and the cmyk equivalent. so if the names are +% that takes both the name and the cmyk equivalent, so if the names are % not being used, `fall back' definitions in the cmyk model are available. % These drivers also allow a numeric value to affect the `density' % of the colour to use. @@ -688,9 +688,9 @@ % % \begin{macro}{\normalcolor} % Early versions of this package redefined |\reset@font| to reset the -% color as well. Current versions do not do this (there are too many -% |\reset@font| commands hidden in strange places) and so defines a -% separate command, |\normalcolor| to reset the colour to the colour in +% color as well. Current versions do not do this (since there are too many +% |\reset@font| commands hidden in strange places) and so they define a +% separate command, |\normalcolor|, to reset the colour to the colour in % effect at the start of the document. % % |\normalcolor| is defined (to |\relax|) in the \LaTeX\ kernel, so it @@ -722,9 +722,9 @@ % the truth as the `macro layer' of \TeX\ does not know where the output % routine is going to re-insert floats. This is why drivers must % maintain their own stack of colours in order to fully support these -% commands. +% commands.) % -% For dvips, the |\current@color| it is something like `|Black|' or +% For dvips, the |\current@color| is something like `|Black|' or % `|rgb 0 1 0|', but other packages should not rely on any particular % format for this macro. % @@ -755,7 +755,7 @@ % definition of this command. A graphics package may want to define it % using a special to produce (for example) a PostScript line. Producing % the line in the |\special| has the advantage that on a preview that -% does not understand |\special|s, the line is automatically omited, +% does not understand |\special|s, the line is automatically omitted, % without needing to modify the source of the document (for instance by % adding the |monochrome| option). % @@ -894,7 +894,7 @@ % \end{macro} % % \begin{macro}{\color@vbox} -% To be used to open a `coloured hbox' +% To be used to open a `coloured vbox' % \changes{v0.3h}{1994/11/22} % {Macro added} % \begin{macrocode} diff --git a/macros/latex-dev/required/graphics/color.pdf b/macros/latex-dev/required/graphics/color.pdf Binary files differindex e1c35c486d..964aa7edbd 100644 --- a/macros/latex-dev/required/graphics/color.pdf +++ b/macros/latex-dev/required/graphics/color.pdf diff --git a/macros/latex-dev/required/graphics/drivers.dtx b/macros/latex-dev/required/graphics/drivers.dtx index 19fa2013db..fb5132272b 100644 --- a/macros/latex-dev/required/graphics/drivers.dtx +++ b/macros/latex-dev/required/graphics/drivers.dtx @@ -3,7 +3,7 @@ % %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2023 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/macros/latex-dev/required/graphics/drivers.pdf b/macros/latex-dev/required/graphics/drivers.pdf Binary files differindex b32569dec4..b010839e78 100644 --- a/macros/latex-dev/required/graphics/drivers.pdf +++ b/macros/latex-dev/required/graphics/drivers.pdf diff --git a/macros/latex-dev/required/graphics/epsfig.dtx b/macros/latex-dev/required/graphics/epsfig.dtx index 8a9911c965..46dc36d0bf 100644 --- a/macros/latex-dev/required/graphics/epsfig.dtx +++ b/macros/latex-dev/required/graphics/epsfig.dtx @@ -2,7 +2,7 @@ % \iffalse % %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz -%% Copyright (C) 2000-2023 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -19,7 +19,7 @@ %<driver> \ProvidesFile{epsfig.drv} % \fi % \ProvidesFile{epsfig.dtx} - [2017/06/25 v1.7b (e)psfig emulation (SPQR)] + [2024/01/14 v1.7b (e)psfig emulation (SPQR)] % % \iffalse %<*driver> @@ -51,7 +51,7 @@ \RequirePackage{graphicx} % \end{macrocode} % \subsection{Emulation of `psfig' syntax} -% Emulate "epsfig.sty", and most varieties of psfig +% Emulate \texttt{epsfig.sty}, and most varieties of psfig % \begin{macro}{\psfig,\epsfig} % \begin{macrocode} \def\psfig#1{% @@ -83,7 +83,7 @@ % \end{macrocode} % \end{macro} % \subsection{Emulation of `epsf' syntax} -% Emulate Rokicki's "epsf.tex" supplied with the ever-popular dvips. +% Emulate Rokicki's \texttt{epsf.tex}, supplied with the ever-popular dvips. % \begin{macro}{\epsfbox,\epsffile} % \begin{macrocode} \newdimen\epsfxsize diff --git a/macros/latex-dev/required/graphics/epsfig.pdf b/macros/latex-dev/required/graphics/epsfig.pdf Binary files differindex 7c863b7a22..36457b3559 100644 --- a/macros/latex-dev/required/graphics/epsfig.pdf +++ b/macros/latex-dev/required/graphics/epsfig.pdf diff --git a/macros/latex-dev/required/graphics/graphics-2017-06-25.sty b/macros/latex-dev/required/graphics/graphics-2017-06-25.sty index 154867d99a..24f6443124 100644 --- a/macros/latex-dev/required/graphics/graphics-2017-06-25.sty +++ b/macros/latex-dev/required/graphics/graphics-2017-06-25.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `graphics.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `graphics.sty', %% generated with the docstrip utility. %% diff --git a/macros/latex-dev/required/graphics/graphics.dtx b/macros/latex-dev/required/graphics/graphics.dtx index d40c70a034..2392ac09d1 100644 --- a/macros/latex-dev/required/graphics/graphics.dtx +++ b/macros/latex-dev/required/graphics/graphics.dtx @@ -2,7 +2,7 @@ % \iffalse % %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2023 LaTeX Project +%% Copyright (C) 1995-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -17,9 +17,9 @@ \ProvidesFile{graphics.dtx} %</dtx> %<+package>\NeedsTeXFormat{LaTeX2e}[1995/12/01] -%<+package>\providecommand\DeclareRelease[3]{} -%<+package>\providecommand\DeclareCurrentRelease[2]{} %<+package> +% Try to fulfill rollback requests to early years by using the 2017 version: +%<+package>\DeclareRelease{}{1994-06-01}{graphics-2017-06-25.sty} %<+package>\DeclareRelease{}{2017-06-25}{graphics-2017-06-25.sty} %<+package>\DeclareCurrentRelease{}{2019-10-01} %<+package> @@ -27,7 +27,7 @@ %<driver> \ProvidesFile{graphics.drv} % \fi % \ProvidesFile{graphics.dtx} - [2022/03/10 v1.4e Standard LaTeX Graphics (DPC,SPQR)] + [2024/05/23 v1.4g Standard LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -69,18 +69,18 @@ % \section{Introduction} % % This package implements various `graphics' functions. The main -% features are a) inclusion of `graphics' files. b) Rotation of sections -% of the page, c) Scaling of sections of the page. +% features are: a) inclusion of `graphics' files; b) rotation of sections +% of the page; c) scaling of sections of the page. % % The design is split into three `levels'. % \begin{itemize} % \item The user interface. This is the collection of commands designed -% to appear in a document text. Actually two separate user interface +% to appear in a document text. Actually two separate user interfaces % have been implemented. The `standard' interface, described here, and a % more powerful, and more `user-friendly' interface provided by the % |graphicx| package. % \item The core functions. These functions, which are also implemented -% in this file do all the `main work'. The `user-interface functions +% in this file, do all the `main work'. The `user-interface functions' % just collect together the information from any optional-arguments or % star-forms, and then call one of these functions. % \item The driver files. It is not possible to achieve the @@ -90,7 +90,7 @@ % and the syntax required to pass instructions to the drivers is also % not standardised. So the `core functions' never access |\special| % directly, but rather call a series of commands that must be defined in -% a special file customised for each driver. The accompanying file, +% a special file customised for each driver. The accompanying file % |drivers.dtx| has suitable files for a range of popular drivers. % \end{itemize} % @@ -99,9 +99,9 @@ % driver that is to be used to print the document. You may wish to set % up a configuration file so that this option always takes effect, even % if not specified in the document. To do this, produce a file -% |graphics.cfg| containing the line:\\ +% |graphics.cfg| containing the line\\ % |\ExecuteOptions{dvips}|\\ -% (or whichever other driver you wish.) +% (or whichever other driver you wish). % % Apart from the driver options there are a few other options to control % the behaviour of the package. @@ -166,7 +166,7 @@ % |\graphicspath{{eps/}{tiff/}}| % would cause the system to look in the subdirectories |eps| and |tiff| % of the current directory. The default setting of this path is -% |\input@path| that is: graphics files will be found wherever \TeX\ +% |\input@path|, so that graphics files will be found wherever \TeX\ % files are found. % % \DescribeMacro @@ -204,7 +204,7 @@ % \emph{default rule}. For instance the |dvips| driver file declares all % files to be of type |eps| unless a more specific rule is declared. % -% Since Version v0.6, extensions should be specified including the |.| +% Since Version v0.6, extensions should be specified including the |.|, % that is, |.eps| not |eps|. % % \emph{type} is the `type' of file involved. All files of the same type @@ -241,7 +241,7 @@ % used to denote the filename. Thus using the dvips driver, one may % use\\ % |\DeclareGraphicsRule{.ps.gz}{eps}{.ps.bb}{`zcat #1}|\\ -% the final argument causes dvips to use the |zcat| command to unzip the +% The final argument causes dvips to use the |zcat| command to unzip the % file before inserting it into the PostScript output. % % \subsection{Rotation} @@ -297,18 +297,18 @@ % \DescribeMacro % {\Gread@eps}\marg{file}\\ % For each \emph{type} of graphics file supported, the driver file must -% define |\Ginclude@|\emph{type} and, optionally |\Gread@|\emph{type}. +% define |\Ginclude@|\emph{type} and, optionally, |\Gread@|\emph{type}. % The read command is responsible for obtaining size information from -% the file specified in the |\DeclareGraphicsRule| command. However the +% the file specified in the |\DeclareGraphicsRule| command. However, the % kernel defines a function, |\Gread@eps|, which can read PostScript % files to find the % |%%BoundingBox| comment. This function will be used for any type for % which a specific function has not been declared. |\Gread@eps| accepts % a generalised version of the bounding box comment. \TeX\ units may be % used (but there must be no space before the unit). If the unit is -% omitted |bp| is assumed. So\\ +% omitted, |bp| is assumed. So\\ % |%%BoundingBox 0 0 2in 3in|\\ -% Would be accepted by this function, to produce a 2in wide, by 3in high +% would be accepted by this function, to produce a 2in wide by 3in high % graphic. % % \subsection{Rotation} @@ -334,7 +334,7 @@ % \DescribeMacro % {\Gscale@box@dddd} % \marg{dima}\marg{dimb}\marg{dimc}\marg{dimd}\marg{text}\\ -% Scale \emph{text} in horizontally by a factor \emph{dima}/\emph{dimb}, +% Scale \emph{text} horizontally by a factor \emph{dima}/\emph{dimb}, % and vertically by a factor of \emph{dimc}/\emph{dimd}. % % \DescribeMacro @@ -353,7 +353,7 @@ % |\Ginclude@|\emph{type}\\ % The Graphics kernel function will call this driver-defined function % with the filename as argument, and certain additional information will -% be provided as follows.: +% be provided as follows: % % \noindent\begin{tabular}{p{.4\textwidth}p{.5\textwidth}} % |\Gin@llx|, |\Gin@lly|,\newline @@ -362,7 +362,7 @@ % Registers storing the natural size.\\ % |\Gin@req@width|\newline |\Gin@req@height| & % Registers storing the required size, after scaling.\\ -% |\Gin@scalex|, |\Gin@scaley| & macros with the scale factors. A value +% |\Gin@scalex|, |\Gin@scaley| & Macros with the scale factors. A value % of |!| means: Scale by the same amount as the other direction.\\ % |\ifGin@clip| & |\newif| token, true if the graphic should be % `clipped' to the bounding box. @@ -371,11 +371,11 @@ % Optionally the driver may define a command of the form:\\ % |\Gread@|\emph{type}\\ % This is responsible for reading an external file to find the bounding -% box information. If such a command is not declared, but a read-file is -% specified the command |\Gread@eps|, which is defined in the Graphics -% Kernel will be used. +% box information. If such a command is not declared but a read-file is +% specified, the command |\Gread@eps|, which is defined in the Graphics +% Kernel, will be used. % -% \subsection{Literal Postscript} +% \subsection{Literal PostScript} % Drivers that are producing PostScript output may want to define % the following macros. They each take one argument which should be % passed to an appropriate special. They are not used directly by this @@ -384,7 +384,7 @@ % |\Gin@PS@raw|, Literal PostScript special.\\ % |\Gin@PS@restored|, Literal PostScript special, the driver will % surround this with a save-restore pair.\\ -% |\Gin@PS@literal@header|, Postscript to be inserted in the header +% |\Gin@PS@literal@header|, PostScript to be inserted in the header % section of the PostScript file.\\ % |\Gin@PS@file@header|, external file to be inserted in the header % section of the PostScript file. @@ -550,7 +550,7 @@ % \changes{v0.3g}{1994/03/15} % {Use dvips def file not development version} % \begin{option}{xdvi} -% Tomas Rockicki's PostScript driver (unix, MSDOS, VMS\ldots). +% Tomas Rokicki's PostScript driver (unix, MSDOS, VMS\ldots). % The |X11| previewer |xdvi| supports basically the same set of % |\specials|. % \begin{macrocode} @@ -672,7 +672,7 @@ % \begin{option}{pctex32} % \changes{v1.0b}{1996/10/29} % {pctex32 option added} -% PC\TeX\ (MSDOS/Windows) . +% PC\TeX\ (MSDOS/Windows). % \begin{macrocode} \DeclareOption{pctexps}{\def\Gin@driver{pctexps.def}} \DeclareOption{pctexwin}{\def\Gin@driver{pctexwin.def}} @@ -913,7 +913,7 @@ % \end{macro} % % \begin{macro}{\Gin@iii} -% Set the coordinates of the {\bfseries l}lower {\bfseries l}eft corner, +% Set the coordinates of the {\bfseries l}ower {\bfseries l}eft corner, % and the coordinates of the {\bfseries u}pper {\bfseries r}ight % corner. The coordinates may be any \TeX\ dimension, defaulting to |bp|. % \changes{v0.6c}{1994/12/15} @@ -944,8 +944,8 @@ % is invisibly small but files conforming to Adobe DSC should have % \emph{integer} Bounding Box Coordinates, and conceivably some drivers % might demand integer values. -% (Although most seem to accept real values (if they accept bounding box -% coordinates at all) in the |\special|. This is the reason why the +% Although most seem to accept real values (if they accept bounding box +% coordinates at all) in the |\special|, this is the reason why the % mechanism uses |\def| and not \TeX\ lengths, as in earlier releases of % the package. % \begin{macrocode} @@ -1454,8 +1454,8 @@ % {New macro} % \begin{macro}{\Gread@generic@aux} % \begin{macro}{\Gread@eps} -% Read an EPS file (|#1|) and search for a line -% starting with |%%BoundingBox| and returns the result +% Read an EPS file (|#1|), search for a line +% starting with |%%BoundingBox|; then return the result % by setting four dimension registers % |\Gin@llx|, |\Gin@lly|, |\Gin@urx| and |\Gin@ury|. % \changes{v0.5e}{1994/11/02} @@ -1701,7 +1701,7 @@ % \begin{macro}{\Grot@left} % \begin{macro}{\Grot@right} % \begin{macro}{\Grot@depth} -% Final Rotated box dimensions +% Final rotated box dimensions % \begin{macrocode} \let\Grot@height\@ovxx \let\Grot@left\@ovyy @@ -1920,8 +1920,8 @@ % \end{macrocode} % Now we should translate back by $(O_x,O_y)$, but \TeX\ can not really % deal with boxes that do not have the reference point at the left edge. -% (Everything with a $-$ve $x$-coordinate would over-print earlier -% text). So we modify the horizontal translation so that the +% (Everything with a negative $x$-coordinate would over-print earlier +% text.) So we modify the horizontal translation so that the % reference point as understood by \TeX\ \emph{is} at the left edge. % This means that the `centre of rotation' is not fixed by |\rotatebox|, % but typically moves horizontally. We also need to find the image of @@ -2157,7 +2157,7 @@ % \end{macrocode} % \end{macro} % -% Restore Catcodes +% Restore catcodes. % \begin{macrocode} \Gin@codes \let\Gin@codes\relax diff --git a/macros/latex-dev/required/graphics/graphics.pdf b/macros/latex-dev/required/graphics/graphics.pdf Binary files differindex 343be34fa6..559f3c5a81 100644 --- a/macros/latex-dev/required/graphics/graphics.pdf +++ b/macros/latex-dev/required/graphics/graphics.pdf diff --git a/macros/latex-dev/required/graphics/graphicx.dtx b/macros/latex-dev/required/graphics/graphicx.dtx index 3bce2bdcf0..92f1af1d39 100644 --- a/macros/latex-dev/required/graphics/graphicx.dtx +++ b/macros/latex-dev/required/graphics/graphicx.dtx @@ -2,7 +2,7 @@ % \iffalse % %% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995-2023 LaTeX Project +%% Copyright (C) 1995-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/macros/latex-dev/required/graphics/graphicx.pdf b/macros/latex-dev/required/graphics/graphicx.pdf Binary files differindex 06aa1ba087..d1568333c2 100644 --- a/macros/latex-dev/required/graphics/graphicx.pdf +++ b/macros/latex-dev/required/graphics/graphicx.pdf diff --git a/macros/latex-dev/required/graphics/grfguide.pdf b/macros/latex-dev/required/graphics/grfguide.pdf Binary files differindex 7aa2c8bc89..4e68cea91e 100644 --- a/macros/latex-dev/required/graphics/grfguide.pdf +++ b/macros/latex-dev/required/graphics/grfguide.pdf diff --git a/macros/latex-dev/required/graphics/grfguide.tex b/macros/latex-dev/required/graphics/grfguide.tex index 585e87adc7..959486c05c 100644 --- a/macros/latex-dev/required/graphics/grfguide.tex +++ b/macros/latex-dev/required/graphics/grfguide.tex @@ -1,5 +1,5 @@ %% grfguide.tex Copyright (C) 1994-1999 David Carlisle -%% Copyright (C) 2005-2021 +%% Copyright (C) 2005-2024 %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -62,7 +62,8 @@ stroke \begin{document} \title{Packages in the `graphics' bundle} \author{D. P. Carlisle \and The \LaTeX\ Project} -\date{2021-03-05} + +\date{2024-05-22} \maketitle @@ -95,8 +96,10 @@ For special requirements you may edit a copy of these |cfg| files to set up a site default for these options. Suppose that you wish the \package{color} package to always default to use specials for the PostScript driver, |dvisvgm|. In that case, create a file |color.cfg| -containing the line:\\ -|\ExecuteOptions{dvisvgm}|\\ +containing the line: +\begin{quote} + |\ExecuteOptions{dvisvgm}| +\end{quote} Normally you will want an identical file |graphics.cfg| to set a similar default for the graphics packages. @@ -113,12 +116,12 @@ The following two options are also supported, they do not correspond to separate definition files, but are essentially aliases for the |dvips| option (and |monochrome| in the case of |xdvi|). \begin{quote}\raggedright - |xdvi|, |oztex| + |xdvi|, |oztex| \end{quote} The following set of options are supported by these packages with associated driver files extracted from the |drivers.dtx| -documented source in this bundle. These are now, mainly of historic +documented source in this bundle. These are now mainly of historic interest but the documented sources do contain some useful code and advice if you need to produce a new definition file for a new driver or \TeX\ system. |drivers.dtx| also contains documented @@ -206,11 +209,11 @@ your own colours use the |\definecolor| command. This defines \m{name} as a colour which can be used in later colour -commands. For example -\begin{verbatim} -\definecolor{light-blue}{rgb}{0.8,0.85,1} -\definecolor{mygrey}{gray}{0.75} -\end{verbatim} +commands. For example: +\begin{quote} + |\definecolor{light-blue}{rgb}{0.8,0.85,1}| \\ + |\definecolor{mygrey}{gray}{0.75}| +\end{quote} \definecolor{light-blue}{rgb}{0.8,0.85,1} \definecolor{mygrey}{gray}{0.75} @@ -227,7 +230,7 @@ The basic syntax is: |\color|\arg{name} \end{decl} -This is a \emph{declaration}, like |\bfseries| It changes the current +This is a \emph{declaration}, like |\bfseries|. It changes the current colour to \m{name} until the end of the current group or environment. @@ -259,7 +262,6 @@ See \texttt{mathcolor.pdf} for details on this command. \subsubsection{Using colour specifications directly} - \begin{decl} |\color|\oarg{model}\arg{specification}\\ |\textcolor|\oarg{model}\arg{specification}\arg{text}\\ @@ -271,18 +273,23 @@ the document preamble, but sometimes it is convenient to directly use a colour without naming it first. To achieve this |\color| (and all the other colour commands) take an optional argument specifying the model. If this is used then the mandatory argument takes a -\m{colour specification} instead of a \m{name}. For example:\\ -|\color[rgb]{1,0.2,0.3}|\\ +\m{colour specification} instead of a \m{name}. For example: +\begin{quote} + |\color[rgb]{1,0.2,0.3}| +\end{quote} would directly select that colour. -This is particularly useful for accessing the \textbf{named} model:\\ -|\color[named]{BrickRed}| selects the |dvips| colour BrickRed. +This is particularly useful for accessing the \textbf{named} model: +\begin{quote} + |\color[named]{BrickRed}| +\end{quote} +selects the |dvips| colour BrickRed. Rather than repeatedly use |[named]| you may use |\definecolor| to -provide convenient aliases:\\ -|\definecolor{myred}{named}{WildStrawberry}| - \ldots\ |\color{myred}|\ \ldots - +provide convenient aliases: +\begin{quote} + |\definecolor{myred}{named}{WildStrawberry}|\ldots |\color{myred}|\kern-10pt +\end{quote} Alternatively if you are happy to use the existing names from the \textbf{named} model, you may use the |usenames| package option, which effectively calls |\definecolor| on every colour in the \textbf{named} @@ -396,7 +403,7 @@ you should set up a site-default in a file, The graphics packages have some other options for controlling how many of the features to enable: \begin{description} -\item[draft] suppress all the `special' features. In particular +\item[draft] Suppress all the `special' features. In particular graphics files are not included (but they are still read for size info) just the filename is printed in a box of the correct size. \item[final] The opposite of |draft|. Useful to over-ride a global @@ -480,18 +487,23 @@ An abbreviation for |\scalebox{-1}[1]|\arg{text}. Scale \emph{text} so that the width is \emph{h-length}. If |!| is used as either length argument, the other argument is used to determine a scale factor that is used in both directions. - Normally \emph{v-length} refers to the height of the box, but in the - star form, it refers to the `height + depth'. + As normal for \LaTeXe\ box length arguments, |\height|, |\width|, |\totalheight|, |\depth| may be used to refer to the original size of the box. + Normally \emph{v-length} refers to the height of the box, but in the + star form, |\resizebox*|, it refers to the `height + depth'. + |\resizebox{1in}{\height}{Some text}|: \resizebox{1in}{\height}{Some text} |\resizebox{1in}{!}{Some text}|: \resizebox{1in}{!}{Some text} +|\resizebox{!}{20pt}{Q} \resizebox*{!}{20pt}{Q}|: +\resizebox{!}{20pt}{Q} \resizebox*{!}{20pt}{Q} + \subsection{Including Graphics Files} The functions for graphics inclusion try to give the same user syntax for including any kind of graphics file that can be understood by the @@ -568,7 +580,7 @@ otherwise it will not use one of the others, with a driver-defined order of preference. |MediaBox| is always present. -The |pagebox| key may be used to specify which bounding box specification to use, +The |pagebox| key may be used to specify which bounding box specification to use. The value should be one of |mediabox|, |cropbox|, |bleedbox|, |trimbox|, |artbox|. \item[viewport]\NEWfeature{1995/06/01} @@ -602,7 +614,7 @@ The value should be one of \item[scale] Scale factor. \item[clip] Either `true' or `false' (or no value, which is equivalent to `true'). Clip the graphic to the bounding box. -\item[draft] a boolean valued key, like `clip'. Locally switches to +\item[draft] A boolean valued key, like `clip'. Locally switches to draft mode. \item[type] Specify the graphics type. \item[ext] Specify the file extension. This should \emph{only} be @@ -614,12 +626,16 @@ The value should be one of \item[quiet]\NEWfeature{2017/06/01} Skip writing information to the log. \item[page]\NEWfeature{2017/06/01} -Page of a multi-page PDF file. (by default the first page will be used.) +Page of a multi-page PDF file. (By default the first page will be used.) \item[interpolate]\NEWfeature{2017/06/01} Enable/disable interpolation of bitmap images by the viewer. +\item[alt]\NEWfeature{2021/09/16} + Alternative text for accessibility uses. By default this key is not used + but users are encouraged to add descriptive text here that may be used in + tagged PDF or as the |alt| attribute in conversions to HTML. \end{description} -For the keys specifying the original size (i.e,, the bounding box, +For the keys specifying the original size (i.e., the bounding box, trim and viewport keys) the units can be omitted, in which case bp (i.e., PostScript points) are assumed. @@ -710,7 +726,7 @@ the \LaTeXe\ primitive |\input@path|. A list of directories, each in a as the directory separator, even on Windows.) The default setting of this path is - |\input@path| that is: graphics files will be found wherever \TeX\ + |\input@path|, so that graphics files will be found wherever \TeX\ files are found. \begin{decl} @@ -748,7 +764,7 @@ must exist at the time \LaTeX\ is used. extension from the \emph{ext-list} specified with |\DeclareGraphicsExtensions|.) -\emph{ext} the file extension for which this rule applies. As a special +\emph{ext} is the file extension for which this rule applies. As a special case, \emph{ext} may be given as |*| to denote the default behaviour for all undeclared extensions (see the example below). @@ -838,7 +854,7 @@ argument would change (and generate errors) if the user were to load \section{Remaining packages in the graphics bundle} \subsection{Epsfig} -This is a small package essentially a `wrapper' around the +This is a small package, essentially a `wrapper' around the \package{graphicx} package, defining a command |\psfig| which has the syntax\\ |\psfig{file=xxx,...}| rather than |\includegraphics[...]{xxx}|.\\ @@ -860,7 +876,7 @@ As well as being used as a \LaTeX\ package, the macros may be extracted with the \package{docstrip} options \texttt{plain,package}. In this case the \LaTeX\ package declarations are omitted from the file, and the macros may be directly used as part of another macro file (they work -with any format based on plain \TeX.) +with any format based on plain \TeX). \subsection{Keyval} The \package{keyval} package is intended to be used by other diff --git a/macros/latex-dev/required/graphics/keyval.dtx b/macros/latex-dev/required/graphics/keyval.dtx index 6e710a78f9..02f9a15ec7 100644 --- a/macros/latex-dev/required/graphics/keyval.dtx +++ b/macros/latex-dev/required/graphics/keyval.dtx @@ -1,7 +1,7 @@ % % \iffalse %% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle -%% Copyright (C) 2000-2023 David Carlisle, LaTeX Project +%% Copyright (C) 2000-2024 David Carlisle, LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/macros/latex-dev/required/graphics/keyval.pdf b/macros/latex-dev/required/graphics/keyval.pdf Binary files differindex 7b1c32da0e..1cfd06071d 100644 --- a/macros/latex-dev/required/graphics/keyval.pdf +++ b/macros/latex-dev/required/graphics/keyval.pdf diff --git a/macros/latex-dev/required/graphics/lscape.dtx b/macros/latex-dev/required/graphics/lscape.dtx index c30a9f8dbd..eca5aa432b 100644 --- a/macros/latex-dev/required/graphics/lscape.dtx +++ b/macros/latex-dev/required/graphics/lscape.dtx @@ -2,7 +2,7 @@ % \iffalse % %% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle -%% Copyright (C) 2000-2023 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% diff --git a/macros/latex-dev/required/graphics/lscape.pdf b/macros/latex-dev/required/graphics/lscape.pdf Binary files differindex a225429e46..b3ffd8c2cd 100644 --- a/macros/latex-dev/required/graphics/lscape.pdf +++ b/macros/latex-dev/required/graphics/lscape.pdf diff --git a/macros/latex-dev/required/graphics/mathcolor.pdf b/macros/latex-dev/required/graphics/mathcolor.pdf Binary files differindex f1bcf17585..36905fbf31 100644 --- a/macros/latex-dev/required/graphics/mathcolor.pdf +++ b/macros/latex-dev/required/graphics/mathcolor.pdf diff --git a/macros/latex-dev/required/graphics/rotating.dtx b/macros/latex-dev/required/graphics/rotating.dtx index 4aefc71156..bac5759956 100644 --- a/macros/latex-dev/required/graphics/rotating.dtx +++ b/macros/latex-dev/required/graphics/rotating.dtx @@ -5,7 +5,7 @@ % File: rotating.dtx %% Copyright (C) 1995-1999 Sebastian Rahtz and Leonor Barroca %% Copyright (C) 2001-2003,2007-2009 Robin Fairbairns -%% Copyright (C) 2016-2023 LaTeX Project +%% Copyright (C) 2016-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. % diff --git a/macros/latex-dev/required/graphics/rotating.pdf b/macros/latex-dev/required/graphics/rotating.pdf Binary files differindex 1fe5a8b8b9..2ecb86346a 100644 --- a/macros/latex-dev/required/graphics/rotating.pdf +++ b/macros/latex-dev/required/graphics/rotating.pdf diff --git a/macros/latex-dev/required/graphics/rotex.pdf b/macros/latex-dev/required/graphics/rotex.pdf Binary files differindex 7c153bad33..251dcd20b1 100644 --- a/macros/latex-dev/required/graphics/rotex.pdf +++ b/macros/latex-dev/required/graphics/rotex.pdf diff --git a/macros/latex-dev/required/graphics/trig.dtx b/macros/latex-dev/required/graphics/trig.dtx index 7e80931d2a..d2fa91f91f 100644 --- a/macros/latex-dev/required/graphics/trig.dtx +++ b/macros/latex-dev/required/graphics/trig.dtx @@ -1,6 +1,6 @@ % \iffalse %% File: trig.dtx Copyright (C) 1993-1999 David Carlisle -%% Copyright (C) 2000-2023 LaTeX Project +%% Copyright (C) 2000-2024 LaTeX Project %% The LaTeX Project and any individual authors listed elsewhere %% in this file. %% @@ -19,7 +19,7 @@ %<driver> \ProvidesFile{trig.drv} % \fi % \ProvidesFile{trig.dtx} - [2021/08/11 v1.11 sin cos tan (DPC)] + [2023/12/02 v1.11 sin cos tan (DPC)] % % \iffalse %</!plain> @@ -214,7 +214,7 @@ % \end{macro} % % \begin{macro}{\TG@reduce} -% Repeatedly use one of the the relations +% Repeatedly use one of the relations % $\sin(x)=\sin(180-x)=\sin(-180-x)$ to get $x$ in the range $-90 \leq % x\leq 90$. Then call |\TG@series|. % \begin{macrocode} diff --git a/macros/latex-dev/required/graphics/trig.pdf b/macros/latex-dev/required/graphics/trig.pdf Binary files differindex 6daa5bc8a2..d220e18d1e 100644 --- a/macros/latex-dev/required/graphics/trig.pdf +++ b/macros/latex-dev/required/graphics/trig.pdf diff --git a/macros/latex-dev/required/latex-lab/README.md b/macros/latex-dev/required/latex-lab/README.md index 8663b7e4ad..fb930aa965 100644 --- a/macros/latex-dev/required/latex-lab/README.md +++ b/macros/latex-dev/required/latex-lab/README.md @@ -1,6 +1,6 @@ # LaTeX laboratory -Release 2024-06-01 pre-release 2 +Release 2024-11-01 pre-release 0 ## Overview diff --git a/macros/latex-dev/required/latex-lab/blocks-code.pdf b/macros/latex-dev/required/latex-lab/blocks-code.pdf Binary files differindex 958db3a440..a5d58887f2 100644 --- a/macros/latex-dev/required/latex-lab/blocks-code.pdf +++ b/macros/latex-dev/required/latex-lab/blocks-code.pdf diff --git a/macros/latex-dev/required/latex-lab/blocks-doc.pdf b/macros/latex-dev/required/latex-lab/blocks-doc.pdf Binary files differindex d34cb17fa3..e62b76f5e3 100644 --- a/macros/latex-dev/required/latex-lab/blocks-doc.pdf +++ b/macros/latex-dev/required/latex-lab/blocks-doc.pdf diff --git a/macros/latex-dev/required/latex-lab/changes.txt b/macros/latex-dev/required/latex-lab/changes.txt index cc5bb2d4f0..cd53086b2b 100644 --- a/macros/latex-dev/required/latex-lab/changes.txt +++ b/macros/latex-dev/required/latex-lab/changes.txt @@ -1,3 +1,23 @@ +2024-05-25 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + * latex-lab-table.dtx: disable table headers in presentation tables. + +2024-05-25 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + * latex-lab-firstaid.dtx: add firstaid for booktabs cmidrules, + see tagging-issue 69. + +2024-04-18 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + * documentmetadata-support.dtx: change handling of default language. + The code now tries to detect languages set by babel/polyglossia. + +2024-04-16 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + * latex-lab-math.dtx: use tagging socket to disable math-writing if tagging + is suspended + +2024-03-24 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * latex-lab-namespace.xlsx: + File added (draft) replacing tagnames-commands.md + 2024-03-23 Ulrike Fischer <Ulrike.Fischer@latex-project.org> * documentmetadata-support.dtx: keys for A4-E and A4-F @@ -47,15 +67,15 @@ them too. Of course, none of this is very robust. By the end of the day well need updating to the new standard solution. -2024-02-23 Ulrike Fischer <Ulrike.Fischer@latex-project.org> - * latex-lab-amsmath.dtx, latex-lab-mathpkg.dtx: handle \pbm and poormans \bm +2024-02-23 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + * latex-lab-amsmath.dtx, latex-lab-mathpkg.dtx: handle \pbm and poormans \bm (luatex only) -2024-02-23 Ulrike Fischer <Ulrike.Fischer@latex-project.org> +2024-02-23 Ulrike Fischer <Ulrike.Fischer@latex-project.org> * update tagpdf and pdfmanagement -2024-02-16 Ulrike Fischer <Ulrike.Fischer@latex-project.org> - * latex-lab-graphic.dtx: move end structure behind \fi, tagging-project#64 +2024-02-16 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + * latex-lab-graphic.dtx: move end structure behind \fi, tagging-project#64 2024-02-12 Ulrike Fischer <Ulrike.Fischer@latex-project.org> * latex-lab-block.dtx: left align description labels. diff --git a/macros/latex-dev/required/latex-lab/documentmetadata-support-code.pdf b/macros/latex-dev/required/latex-lab/documentmetadata-support-code.pdf Binary files differindex 8699dd4426..bc995e7cce 100644 --- a/macros/latex-dev/required/latex-lab/documentmetadata-support-code.pdf +++ b/macros/latex-dev/required/latex-lab/documentmetadata-support-code.pdf diff --git a/macros/latex-dev/required/latex-lab/documentmetadata-support-doc.pdf b/macros/latex-dev/required/latex-lab/documentmetadata-support-doc.pdf Binary files differindex 89d9c58314..9466a187ff 100644 --- a/macros/latex-dev/required/latex-lab/documentmetadata-support-doc.pdf +++ b/macros/latex-dev/required/latex-lab/documentmetadata-support-doc.pdf diff --git a/macros/latex-dev/required/latex-lab/documentmetadata-support.dtx b/macros/latex-dev/required/latex-lab/documentmetadata-support.dtx index 54483ec4c9..a629d9c551 100644 --- a/macros/latex-dev/required/latex-lab/documentmetadata-support.dtx +++ b/macros/latex-dev/required/latex-lab/documentmetadata-support.dtx @@ -350,14 +350,35 @@ \file_input:n {l3backend-testphase-\c_sys_backend_str.def} \ExplSyntaxOff\makeatother % \end{macrocode} -% Set the default language (this requires that the backend has been loaded), -% process the rest of the keys, -% and setup the generic driver. +% +% Process the init keys and setup the generic driver. % \begin{macrocode} - \keys_set_filter:nnn { document / metadata } { init } { lang=en-US, #1 } + \keys_set_filter:nnn { document / metadata } { init } { #1 } \bool_if:NT \g_@@_active_bool { \PassOptionsToPackage{customdriver=hgeneric-testphase}{hyperref} +% \end{macrocode} +% Finally we setup the language default. +% This is done after the begindocument hook so that it can pick up settings +% from babel. If the Catalog dictionary already contains a lang value we do nothing, +% otherwise we use the value stored in \cs{BCPdata}, either the main language +% (if its exists) or the fall back language. +% Note: if babel is loaded without a language this gives the language \texttt{und}. +% \begin{macrocode} + \g@addto@macro\@kernel@after@begindocument + { + \pdfdict_get:nnN {g__pdf_Core/Catalog}{Lang}\l_@@_tmpa_tl + \quark_if_no_value:NT\l_@@_tmpa_tl + { + \tl_if_empty:eTF { \BCPdata{main.language} } + { \tl_set:Ne \l_@@_tmpb_tl { \BCPdata{language} } } + { \tl_set:Ne \l_@@_tmpb_tl { \BCPdata{main.language} } } + \msg_warning:nne { meta } { lang-missing }{ \l_@@_tmpb_tl } + \exp_last_unbraced:Ne + \AddToDocumentProperties{[document]{lang}{\l_@@_tmpb_tl}} + \pdfmanagement_add:nne {Catalog} {Lang}{(\l_@@_tmpb_tl)} + } + } } % \end{macrocode} % \cs{pdfmanagement_add:nnn} has collected values in this hook. @@ -556,6 +577,11 @@ { LaTeX-lab~package~'#1'~not~found. } +\msg_new:nnn { meta } { lang-missing } + { + The~language~has~not~been~set~in~\token_to_str:N + \DocumentMetadata.\\Setting~it~to~'#1'~as~fallback. + } % \end{macrocode} % % \begin{macrocode} diff --git a/macros/latex-dev/required/latex-lab/latex-lab-amsmath.pdf b/macros/latex-dev/required/latex-lab/latex-lab-amsmath.pdf Binary files differindex 3b652dd264..794d259d4c 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-amsmath.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-amsmath.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-bib.pdf b/macros/latex-dev/required/latex-lab/latex-lab-bib.pdf Binary files differindex 94cc528e47..7eb16beaf9 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-bib.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-bib.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-block.pdf b/macros/latex-dev/required/latex-lab/latex-lab-block.pdf Binary files differindex 806562c30a..d13acb45d3 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-block.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-block.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-firstaid.dtx b/macros/latex-dev/required/latex-lab/latex-lab-firstaid.dtx index ba4addadd2..ce0d46f815 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-firstaid.dtx +++ b/macros/latex-dev/required/latex-lab/latex-lab-firstaid.dtx @@ -16,8 +16,8 @@ % % for those people who are interested or want to report an issue. % -\def\ltlabfirstaiddate{2024-03-18} -\def\ltlabfirstaidversion{0.85c} +\def\ltlabfirstaiddate{2024-05-25} +\def\ltlabfirstaidversion{0.85d} %<*driver> \documentclass{l3doc} \EnableCrossrefs @@ -65,6 +65,32 @@ \ltlabfirstaiddate\space v\ltlabfirstaiddate\space Temporary patches to external packages needed for the tagging project] % \end{macrocode} +% \begin{macro}{\FirstAidNeededT} +% This is a very simple help to ensure that we only apply first aid +% to an unmodified package or class. It only works in the case the +% file has already been loaded and the csname \cs{ver@\#1.\#2} got +% defined (holding the current date, version, and short description +% info). We then compare its content to a frozen string and make +% the modification \verb=#3= only if both agree. If they differ we +% assume that the package/class in question got updated by its +% maintainer. +% \begin{macrocode} +\ExplSyntaxOn +\providecommand\FirstAidNeededT[3]{ + \exp_args:Ncx\str_if_eq:onF{ver@#1.#2}{#3} + { \typeout{==>~ First~ Aid~ for~ #1.#2~ no~ longer~ applied!^^J + \@spaces Expected:^^J + \@spaces\@spaces #3^^J + \@spaces but~ found:^^J + \@spaces\@spaces \use:c{ver@#1.#2}^^J + \@spaces so~ I'm~ assuming~ it~ got~ fixed. + } } + \exp_args:Ncx\str_if_eq:onT{ver@#1.#2}{#3} +} +\ExplSyntaxOff +% \end{macrocode} +% \end{macro} + % \subsection{ams classes} % The amsart and amsbook classes do not use \cs{@author} to store the author list % but a command \cs{authors}. To be able to nevertheless use the authors in the @@ -254,6 +280,41 @@ } % \end{macrocode} % +% \subsection{booktabs} +% In some cases booktabs inserts a +% \cs{multispan} into the table (through the commands \cs{@cmidruleb} +% and \cs{@cmidrulea} and this then errors +% with the tagging code. +% This affects both tabular and longtable +% (but longtable more as booktabs handles lines in longtable differently). +% See also issue \url{https://github.com/latex3/tagging-project/issues/69} +% +% +\ExplSyntaxOn +\AddToHook{package/booktabs/after} + { + \def\@cmidrulea{ + \multispan\@cmidla + &\multispan\@cmidlb + \unskip\hskip\cmrkern@l + { + \tag_mc_begin:n{artifact} + \CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill\kern\z@} + \hskip\cmrkern@r + \tag_mc_end: \int_gdecr:N \g__tbl_row_int + \cr} + + \def\@cmidruleb{% + \multispan\@cmidlb + \unskip\hskip \cmrkern@l% + { + \tag_mc_begin:n{artifact} + \CT@arc@\leaders\hrule \@height\@thisrulewidth\hfill\kern\z@} + \hskip\cmrkern@r + \tag_mc_end: \int_gdecr:N \g__tbl_row_int + \cr} + } +\ExplSyntaxOff % % \begin{macrocode} %</package> diff --git a/macros/latex-dev/required/latex-lab/latex-lab-firstaid.pdf b/macros/latex-dev/required/latex-lab/latex-lab-firstaid.pdf Binary files differindex a9789040a1..c035081f6b 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-firstaid.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-firstaid.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-float.pdf b/macros/latex-dev/required/latex-lab/latex-lab-float.pdf Binary files differindex 7940618082..edc88f0b2a 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-float.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-float.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-footnotes.pdf b/macros/latex-dev/required/latex-lab/latex-lab-footnotes.pdf Binary files differindex 2c1ca4f76d..6fa73ecf8b 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-footnotes.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-footnotes.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-graphic.pdf b/macros/latex-dev/required/latex-lab/latex-lab-graphic.pdf Binary files differindex 7cb2babc4b..04e6d424d0 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-graphic.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-graphic.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-marginpar.pdf b/macros/latex-dev/required/latex-lab/latex-lab-marginpar.pdf Binary files differindex a80fe64faa..1e9317d8f4 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-marginpar.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-marginpar.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-math.dtx b/macros/latex-dev/required/latex-lab/latex-lab-math.dtx index 4fabde3d11..0dbc591185 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-math.dtx +++ b/macros/latex-dev/required/latex-lab/latex-lab-math.dtx @@ -19,8 +19,8 @@ % for those people who are interested or want to report an issue. % % -\def\ltlabmathdate{2024-02-09} -\def\ltlabmathversion{0.5i} +\def\ltlabmathdate{2024-04-16} +\def\ltlabmathversion{0.5j} % %<*driver> \documentclass{l3doc} @@ -654,15 +654,15 @@ % a simple Desc key, take care that it is a valid string! % \begin{macrocode} \pdfdict_put:nne {l_pdffile/Filespec} {Desc}{(mathml-#1)} - \pdffile_embed_stream:nnN {#4}{mathml-#1.xml}\l_tmpa_tl + \pdffile_embed_stream:nnN {#4}{mathml-#1.xml}\l_@@_tmpa_tl % \end{macrocode} % not strictly necessary but makes the files visible in the file attachment % page % \begin{macrocode} \bool_if:NT \l__tag_math_mathml_pane_bool - {\pdfmanagement_add:nne {Catalog/Names}{EmbeddedFiles}{\l_tmpa_tl}} + {\pdfmanagement_add:nne {Catalog/Names}{EmbeddedFiles}{\l_@@_tmpa_tl}} \tl_new:c{g_@@_mathml_#3_tl} - \tl_gset_eq:cN{g_@@_mathml_#3_tl}\l_tmpa_tl + \tl_gset_eq:cN{g_@@_mathml_#3_tl}\l_@@_tmpa_tl } } % \end{macrocode} @@ -1374,17 +1374,18 @@ \@@_process:nn { math } {#1} % $ % \end{macrocode} % We do not want math tagging in fakemath or when measuring, +% We also do not want math tagging if tagging has been suspended. % \begin{macrocode} \bool_lazy_or:nnTF {\legacy_if_p:n { measuring@ }} { \l_@@_fakemath_bool } { #1 $ } { - \socket_use:n {tagsupport/math/inline/begin} %end P-MC - \socket_use:nn{tagsupport/math/inline/formula/begin}{#1} + \tag_socket_use:n {math/inline/begin} %end P-MC + \tag_socket_use:nn {math/inline/formula/begin}{#1} $ - \socket_use:n {tagsupport/math/inline/formula/end} - \socket_use:n {tagsupport/math/inline/end} % restart P-MC + \tag_socket_use:n {math/inline/formula/end} + \tag_socket_use:n {math/inline/end} % restart P-MC } } } diff --git a/macros/latex-dev/required/latex-lab/latex-lab-math.pdf b/macros/latex-dev/required/latex-lab/latex-lab-math.pdf Binary files differindex f9b74b0553..355c1b35db 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-math.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-math.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-mathpkg.pdf b/macros/latex-dev/required/latex-lab/latex-lab-mathpkg.pdf Binary files differindex fb9a09adc9..daa20cf2e2 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-mathpkg.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-mathpkg.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-mathtools.pdf b/macros/latex-dev/required/latex-lab/latex-lab-mathtools.pdf Binary files differindex 0f6d85c344..aae05b3b63 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-mathtools.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-mathtools.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-minipage.pdf b/macros/latex-dev/required/latex-lab/latex-lab-minipage.pdf Binary files differindex eda0551b7a..68aeacb9ec 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-minipage.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-minipage.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-namespace.dtx b/macros/latex-dev/required/latex-lab/latex-lab-namespace.dtx index a6087abe57..cfc06c7b09 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-namespace.dtx +++ b/macros/latex-dev/required/latex-lab/latex-lab-namespace.dtx @@ -26,7 +26,7 @@ % \fi % \title{Prototype reimplementation of \LaTeXe{}'s role mapping} % \author{\LaTeX{} Project, initial implementation Ulrike Fischer} -% \date{v0.8 2023-09-04} +% \date{v0.8b 2024-03-24} % % \maketitle % @@ -62,18 +62,33 @@ % \begin{macrocode} title, Title, pdf2, part, Title, pdf2, +% \end{macrocode} +% Headings differ in article and book class. This here is for article: +% \begin{macrocode} section, H1, pdf2, subsection, H2, pdf2, subsubsection,H3, pdf2, paragraph, H4, pdf2, subparagraph, H5, pdf2, +% \end{macrocode} +% And this here is used in book: +% \begin{macrocode} +%chapter, H1, pdf2, +%section, H2, pdf2, +%subsection, H3, pdf2, +%subsubsection, H4, pdf2, +%paragraph, H5, pdf2, +%subparagraph, H6, pdf2, +% \end{macrocode} +% +% \begin{macrocode} list, L, pdf2, itemize, L, pdf2, enumerate, L, pdf2, description, L, pdf2, quote, BlockQuote,pdf, quotation, BlockQuote,pdf, -verbatim, Div, pdf2, +verbatim, Div, pdf2, % overwritten by block item, LI, pdf2, itemlabel, Lbl, pdf2, itembody, LBody, pdf2, diff --git a/macros/latex-dev/required/latex-lab/latex-lab-namespace.pdf b/macros/latex-dev/required/latex-lab/latex-lab-namespace.pdf Binary files differindex 113688d669..c172554fd8 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-namespace.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-namespace.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-new-or-1.pdf b/macros/latex-dev/required/latex-lab/latex-lab-new-or-1.pdf Binary files differindex c2cd53f8e5..ae453a241c 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-new-or-1.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-new-or-1.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-new-or-2.pdf b/macros/latex-dev/required/latex-lab/latex-lab-new-or-2.pdf Binary files differindex b0c53e859b..87d097a831 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-new-or-2.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-new-or-2.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-sec.pdf b/macros/latex-dev/required/latex-lab/latex-lab-sec.pdf Binary files differindex cdf61e2b1e..d7e97aa25c 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-sec.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-sec.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-table.dtx b/macros/latex-dev/required/latex-lab/latex-lab-table.dtx index 5352df9550..38596478ae 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-table.dtx +++ b/macros/latex-dev/required/latex-lab/latex-lab-table.dtx @@ -16,8 +16,8 @@ % % for those people who are interested or want to report an issue. % -\def\ltlabtbldate{2024-02-07} -\def\ltlabtblversion{0.85k} +\def\ltlabtbldate{2024-05-25} +\def\ltlabtblversion{0.85i} %<*driver> \documentclass{l3doc} \EnableCrossrefs @@ -121,11 +121,14 @@ % \verb|\tagpdfsetup{table/tagging=false}| or with \verb|\tagpdfsetup{table/tagging=presentation}|% % \footnote{The key has been renamed. The old name `table-tagging` still works but is % deprecated. The value \texttt{presentation} refers to the ARIA role \enquote{presentation}.} -% The first option disables the table tagging code and he content of the tabular +% The first option disables the table tagging code and the content of the tabular % is then treated more or less like running text. This works ok for simple tables using % only hmode-cells (l/c/r) with normal text content, but fails if the table uses vmode-cells % (p/m/b). In such cases the second option works better: it keeps the tagging code active -% but changes the tag names to \texttt{Div} and the grouping structure \texttt{NonStruct}. +% but changes the tag names to \texttt{Div} and the grouping structure \texttt{NonStruct}. It also +% (re)sets the \texttt{table/header-rows} key to empty. +% The key should currently only be used in a group as there is no key (yet) to reset to the default +% tag names. % % Inside cells the automatic tagging of paragraphs is disabled with the exception of % p/m/b-type cells. @@ -570,7 +573,7 @@ \prop_if_exist:cT { g__tag_struct_ \l_@@_tmpa_tl _prop } { - \@@_struct_prop_gput:Vnn \l_@@_tmpa_tl {S}{/Artifact} + \exp_args:No \__tag_struct_prop_gput:nnn {\l_@@_tmpa_tl} {S}{/Artifact} } } } @@ -661,7 +664,7 @@ \prop_if_exist:cT { g__tag_struct_ \l_@@_tmpa_tl _prop } { - \@@_struct_prop_gput:Vnn \l_@@_tmpa_tl {S}{/Artifact} + \exp_args:No\__tag_struct_prop_gput:nnn {\l_@@_tmpa_tl} {S}{/Artifact} } } } @@ -883,6 +886,7 @@ \tl_set:Nn\l_@@_pcelltag_tl {NonStruct} \tl_set:Nn\l_@@_celltag_tl {text} \tl_set:Nn\l_@@_tabletag_tl {Div} + \clist_clear:N \l_@@_header_rows_clist }, table/tagging .default:n = true, table/tagging .initial:n = true @@ -953,28 +957,13 @@ % % \begin{variable}{\l_@@_header_rows_clist} % This holds the numbers of the header rows. Negative numbers are -% possible and count from the back. +% possible and count from the last column backwards. % \begin{macrocode} \clist_new:N \l_@@_header_rows_clist % \end{macrocode} % \end{variable} % % \begin{macro}{\@@_set_header_rows:} -% TEMP: Next tagpdf will have the right command which also updates -% the debug info. -% For now a temporary command: -% \begin{macrocode} -\cs_if_free:NTF \__tag_struct_prop_gput:nnn - { - \cs_new_protected:Npn \@@_struct_prop_gput:nnn #1#2#3 - { \prop_gput:cnn { g__tag_struct_#1_prop }{#2}{#3} } - } - { \cs_new_protected:Npn \@@_struct_prop_gput:nnn #1#2#3 - { \__tag_struct_prop_gput:nnn {#1}{#2}{#3} } - } -\cs_generate_variant:Nn \@@_struct_prop_gput:nnn {nne,Vnn} -% \end{macrocode} -% % \begin{macrocode} \cs_new_protected:Npn \@@_set_header_rows: { @@ -991,7 +980,7 @@ % \begin{macrocode} \prop_if_exist:cT { g__tag_struct_####1_prop } { - \@@_struct_prop_gput:nnn{ ####1 }{S}{/TH} + \__tag_struct_prop_gput:nnn{ ####1 }{S}{/TH} % \end{macrocode} % This need refinement once row headers (and perhaps other attributes) % are used too, but for now it should be ok. @@ -1000,8 +989,8 @@ { g__tag_struct_####1_prop } { C } \l_@@_tmpa_tl - {\@@_struct_prop_gput:nne{ ####1 }{C}{[/TH-col~\l_@@_tmpa_tl]} } - {\@@_struct_prop_gput:nnn{ ####1 }{C}{/TH-col}} + {\__tag_struct_prop_gput:nne{ ####1 }{C}{[/TH-col~\l_@@_tmpa_tl]} } + {\__tag_struct_prop_gput:nnn{ ####1 }{C}{/TH-col}} } } } diff --git a/macros/latex-dev/required/latex-lab/latex-lab-table.pdf b/macros/latex-dev/required/latex-lab/latex-lab-table.pdf Binary files differindex a87f7638df..199232ce63 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-table.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-table.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-testphase.pdf b/macros/latex-dev/required/latex-lab/latex-lab-testphase.pdf Binary files differindex 9cb5334c0d..531eff4508 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-testphase.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-testphase.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-text.pdf b/macros/latex-dev/required/latex-lab/latex-lab-text.pdf Binary files differindex 8b778cc94b..ded11a05be 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-text.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-text.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-title.pdf b/macros/latex-dev/required/latex-lab/latex-lab-title.pdf Binary files differindex 94ea473b98..934b25bdda 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-title.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-title.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-toc-hyperref-changes.pdf b/macros/latex-dev/required/latex-lab/latex-lab-toc-hyperref-changes.pdf Binary files differindex e94e8e9cc3..58690a8fa9 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-toc-hyperref-changes.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-toc-hyperref-changes.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-toc-kernel-changes.pdf b/macros/latex-dev/required/latex-lab/latex-lab-toc-kernel-changes.pdf Binary files differindex 65e534d37b..c3dc4523e5 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-toc-kernel-changes.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-toc-kernel-changes.pdf diff --git a/macros/latex-dev/required/latex-lab/latex-lab-toc.pdf b/macros/latex-dev/required/latex-lab/latex-lab-toc.pdf Binary files differindex 1bea97e1d9..ba23989257 100644 --- a/macros/latex-dev/required/latex-lab/latex-lab-toc.pdf +++ b/macros/latex-dev/required/latex-lab/latex-lab-toc.pdf diff --git a/macros/latex-dev/required/tools/README.md b/macros/latex-dev/required/tools/README.md index f1500cc4c4..69e0112887 100644 --- a/macros/latex-dev/required/tools/README.md +++ b/macros/latex-dev/required/tools/README.md @@ -1,7 +1,7 @@ The LaTeX `tools` bundle ======================== -Release 2024-06-01 pre-release 2 +Release 2024-11-01 pre-release 0 Overview -------- diff --git a/macros/latex-dev/required/tools/afterpage.pdf b/macros/latex-dev/required/tools/afterpage.pdf Binary files differindex afe6cd4471..a7679b78a3 100644 --- a/macros/latex-dev/required/tools/afterpage.pdf +++ b/macros/latex-dev/required/tools/afterpage.pdf diff --git a/macros/latex-dev/required/tools/array-2016-10-06.sty b/macros/latex-dev/required/tools/array-2016-10-06.sty index f079fd4975..ced72d2913 100644 --- a/macros/latex-dev/required/tools/array-2016-10-06.sty +++ b/macros/latex-dev/required/tools/array-2016-10-06.sty @@ -1,5 +1,7 @@ %% -%% This is an old release of `array.sty', +%% This is an old release of `array.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== %% %% Copyright 1993-2016 %% The LaTeX Project and any individual authors listed elsewhere diff --git a/macros/latex-dev/required/tools/array-2020-02-10.sty b/macros/latex-dev/required/tools/array-2020-02-10.sty index 1243f25f74..5acd9c727e 100644 --- a/macros/latex-dev/required/tools/array-2020-02-10.sty +++ b/macros/latex-dev/required/tools/array-2020-02-10.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `array.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `array.sty', %% generated with the docstrip utility. %% @@ -38,11 +42,6 @@ %% Package `array' to use with LaTeX 2e %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. \NeedsTeXFormat{LaTeX2e}[1995/06/01] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} - -\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty} -\DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{array} [2020/02/10 v2.4m Tabular extension package (FMi)] diff --git a/macros/latex-dev/required/tools/array-2023-11-01.sty b/macros/latex-dev/required/tools/array-2023-11-01.sty index cd6eee6a0f..b5267cffd2 100644 --- a/macros/latex-dev/required/tools/array-2023-11-01.sty +++ b/macros/latex-dev/required/tools/array-2023-11-01.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `array.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `array.sty', %% generated with the docstrip utility. %% @@ -38,12 +42,6 @@ %% Package `array' to use with LaTeX 2e %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. \NeedsTeXFormat{LaTeX2e}[1995/06/01] -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} - -\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty} -\DeclareRelease{v2.4}{2020-02-10}{array-2020-02-10.sty} -\DeclareCurrentRelease{}{2020-10-01} \ProvidesPackage{array} [2023/10/16 v2.5g Tabular extension package (FMi)] diff --git a/macros/latex-dev/required/tools/array.dtx b/macros/latex-dev/required/tools/array.dtx index 66c40a5267..e77ef0a3bf 100644 --- a/macros/latex-dev/required/tools/array.dtx +++ b/macros/latex-dev/required/tools/array.dtx @@ -25,9 +25,10 @@ %% Package `array' to use with LaTeX 2e %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved. %<+package>\NeedsTeXFormat{LaTeX2e}[1995/06/01] -%<+package>\providecommand\DeclareRelease[3]{} -%<+package>\providecommand\DeclareCurrentRelease[2]{} %<+package> +% For anything before 2016-10-06 we load the 2016 version and hope for the best: +%<+package>\DeclareRelease{}{1994-06-01}{array-2016-10-06.sty} +% %<+package>\DeclareRelease{}{2016-10-06}{array-2016-10-06.sty} %<+package>\DeclareRelease{v2.4}{2020-02-10}{array-2020-02-10.sty} %<+package>\DeclareRelease{v2.5}{2023-11-01}{array-2023-11-01.sty} @@ -38,7 +39,7 @@ % \begin{macrocode} %<+package>\NeedsTeXFormat{LaTeX2e}[2024/06/01] %<+package>\ProvidesPackage{array} -%<+package> [2023/12/11 v2.6a Tabular extension package (FMi)] +%<+package> [2024/05/23 v2.6c Tabular extension package (FMi)] % % \fi % @@ -1371,6 +1372,7 @@ Bug reports can be opened (category \texttt{#1}) at\\% % % \begin{macro}{\insert@column} % \begin{macro}{\@sharp} +% \begin{macro}{\textonly@unskip} % We now define the macro =\insert@column= which will do % this work for us. % \begin{macrocode} @@ -1399,8 +1401,9 @@ Bug reports can be opened (category \texttt{#1}) at\\% % \changes{v2.0e}{1991/02/07}{Added \{\} around \cs{@sharp} for new ftsel} % \changes{v2.0h}{1992/06/22}{Removed \{\} again in favour of % \cs{d@llarbegin}} +% \changes{v2.6b}{2024/04/08}{Do not \cs{unskip} if in math mode (gh/1323)} % \begin{macrocode} - \ignorespaces \@sharp \unskip + \ignorespaces \@sharp \textonly@unskip % \end{macrocode} % Then the second \textsf{token} register follows whose number should % be saved in =\count@=. @@ -1420,6 +1423,12 @@ Bug reports can be opened (category \texttt{#1}) at\\% \UseTaggingSocket{tbl/cell/end}% } % \end{macrocode} +% Do the unskip only if we are in hmode: +% \changes{v2.6b}{2024/04/08}{Do not \cs{unskip} if in math mode (gh/1323)} +% \begin{macrocode} +\protected\def\textonly@unskip{\ifhmode\unskip\fi} +% \end{macrocode} +% \end{macro} % \end{macro} % \end{macro} % diff --git a/macros/latex-dev/required/tools/array.pdf b/macros/latex-dev/required/tools/array.pdf Binary files differindex c0c1d1035f..715f3284ec 100644 --- a/macros/latex-dev/required/tools/array.pdf +++ b/macros/latex-dev/required/tools/array.pdf diff --git a/macros/latex-dev/required/tools/bm.pdf b/macros/latex-dev/required/tools/bm.pdf Binary files differindex a94e1325b8..a92141480e 100644 --- a/macros/latex-dev/required/tools/bm.pdf +++ b/macros/latex-dev/required/tools/bm.pdf diff --git a/macros/latex-dev/required/tools/calc.pdf b/macros/latex-dev/required/tools/calc.pdf Binary files differindex 3e1f07af3a..c5424a2a9f 100644 --- a/macros/latex-dev/required/tools/calc.pdf +++ b/macros/latex-dev/required/tools/calc.pdf diff --git a/macros/latex-dev/required/tools/changes.txt b/macros/latex-dev/required/tools/changes.txt index 4339d8e702..afd942a4e7 100644 --- a/macros/latex-dev/required/tools/changes.txt +++ b/macros/latex-dev/required/tools/changes.txt @@ -5,6 +5,41 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +================================================================================ +All changes above are only part of the development branch for the next release. +================================================================================ + +######################### +# 2023-11-01 Release +######################### + +2024-05-23 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * array.dtx: + * longtable.dtx: + * multicol.dtx: + * showkeys.dtx: + * varioref.dtx: + Do not error with "suspicous date" when rolling back to + early years of LaTeX2e (gh/1336) + +2024-05-09 Yukai Chou <muzimuzhi@gmail.com> + + * amsmath.dtx: + Fix typo in comment, \Umathcar -> \Umathchar (gh/1343) + +2024-04-10 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + + * xr.dtx: + Merged in the code from xr-hyper. This extends xr to properly support + targets and links and also adds support for properties (gh/1180). + +2024-04-08 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * array.dtx (section{The insertion of declarations): + Do not \unskip if in math mode, this way explicit spaces at the + end of the math cell remain as it is with array env in core LaTeX (gh/1323) + 2024-03-13 David Carlisle <David.Carlisle@latex-project.org> * l3sys-query.dtx @@ -16,7 +51,7 @@ are not part of the distribution. 2023-12-16 David Carlisle <David.Carlisle@latex-project.org> - * showkeys.dtx: avoid adding extra box to \@lables gh/1123 + * showkeys.dtx: avoid adding extra box to \@labels gh/1123 2023-12-16 Frank Mittelbach <Frank.Mittelbach@latex-project.org> @@ -41,10 +76,6 @@ are not part of the distribution. * multicol.dtx (subsection{Maintaining the mark registers}]): Get rid of forced breaks for mark extraction (gh/1130) -================================================================================ -All changes above are only part of the development branch for the next release. -================================================================================ - ######################### # 2023-11-01c Release ######################### diff --git a/macros/latex-dev/required/tools/dcolumn.pdf b/macros/latex-dev/required/tools/dcolumn.pdf Binary files differindex 3b0e4e485b..537bc4d21c 100644 --- a/macros/latex-dev/required/tools/dcolumn.pdf +++ b/macros/latex-dev/required/tools/dcolumn.pdf diff --git a/macros/latex-dev/required/tools/delarray.pdf b/macros/latex-dev/required/tools/delarray.pdf Binary files differindex 75c9f0225e..47b5a5fa9a 100644 --- a/macros/latex-dev/required/tools/delarray.pdf +++ b/macros/latex-dev/required/tools/delarray.pdf diff --git a/macros/latex-dev/required/tools/enumerate.pdf b/macros/latex-dev/required/tools/enumerate.pdf Binary files differindex 71af43ddc0..fc9d77d6af 100644 --- a/macros/latex-dev/required/tools/enumerate.pdf +++ b/macros/latex-dev/required/tools/enumerate.pdf diff --git a/macros/latex-dev/required/tools/fileerr.pdf b/macros/latex-dev/required/tools/fileerr.pdf Binary files differindex bfa08b68cb..574edfdb38 100644 --- a/macros/latex-dev/required/tools/fileerr.pdf +++ b/macros/latex-dev/required/tools/fileerr.pdf diff --git a/macros/latex-dev/required/tools/fontsmpl.pdf b/macros/latex-dev/required/tools/fontsmpl.pdf Binary files differindex 54a21ad1cc..8d4fe68316 100644 --- a/macros/latex-dev/required/tools/fontsmpl.pdf +++ b/macros/latex-dev/required/tools/fontsmpl.pdf diff --git a/macros/latex-dev/required/tools/ftnright.pdf b/macros/latex-dev/required/tools/ftnright.pdf Binary files differindex 7218f93ab4..9f2da32d26 100644 --- a/macros/latex-dev/required/tools/ftnright.pdf +++ b/macros/latex-dev/required/tools/ftnright.pdf diff --git a/macros/latex-dev/required/tools/hhline.pdf b/macros/latex-dev/required/tools/hhline.pdf Binary files differindex 2040d11a2e..b2b7bc6adb 100644 --- a/macros/latex-dev/required/tools/hhline.pdf +++ b/macros/latex-dev/required/tools/hhline.pdf diff --git a/macros/latex-dev/required/tools/indentfirst.pdf b/macros/latex-dev/required/tools/indentfirst.pdf Binary files differindex 4ac9dbaf87..c95cef137f 100644 --- a/macros/latex-dev/required/tools/indentfirst.pdf +++ b/macros/latex-dev/required/tools/indentfirst.pdf diff --git a/macros/latex-dev/required/tools/l3sys-query.dtx b/macros/latex-dev/required/tools/l3sys-query.dtx index d8c92adac1..3cba5da4a6 100644 --- a/macros/latex-dev/required/tools/l3sys-query.dtx +++ b/macros/latex-dev/required/tools/l3sys-query.dtx @@ -15,7 +15,7 @@ %<driver> \ProvidesFile{l3sys-query.drv} % \fi % \ProvidesFile{l3sys-query.dtx} - [2024-03-13 v1.0a LaTeX2e interface for l3sys file queries] + [2024-03-28 v1.0a LaTeX2e interface for l3sys file queries] % % \iffalse %<*driver> @@ -122,7 +122,7 @@ % programming interface described in the following section, which allows % the sequence to be manipulated before being used. % -% The defined keys map vey closely to the options of the +% The defined keys map very closely to the options of the % \texttt{l3sys-query} command which is described in % section~\ref{sec:lua}. % @@ -138,7 +138,7 @@ % The key \texttt{type} accepts \texttt{d} or \texttt{f}. % % \item -% The key \texttt{exclude} accepts a glob (or Lua pattern) mathing +% The key \texttt{exclude} accepts a glob (or Lua pattern) matching % files to be excluded. The package arranges that the quoting of the % argument is automatically added if unrestricted shell escape is % enabled. diff --git a/macros/latex-dev/required/tools/l3sys-query.pdf b/macros/latex-dev/required/tools/l3sys-query.pdf Binary files differindex 9f67a453e1..e333418672 100644 --- a/macros/latex-dev/required/tools/l3sys-query.pdf +++ b/macros/latex-dev/required/tools/l3sys-query.pdf diff --git a/macros/latex-dev/required/tools/layout.pdf b/macros/latex-dev/required/tools/layout.pdf Binary files differindex 90c51932ce..6cbbc763ca 100644 --- a/macros/latex-dev/required/tools/layout.pdf +++ b/macros/latex-dev/required/tools/layout.pdf diff --git a/macros/latex-dev/required/tools/longtable-2020-01-07.sty b/macros/latex-dev/required/tools/longtable-2020-01-07.sty index f79c691e10..fc7c3f4290 100644 --- a/macros/latex-dev/required/tools/longtable-2020-01-07.sty +++ b/macros/latex-dev/required/tools/longtable-2020-01-07.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `longtable.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `longtable.sty', %% generated with the docstrip utility. %% diff --git a/macros/latex-dev/required/tools/longtable.dtx b/macros/latex-dev/required/tools/longtable.dtx index 5a23f3ecb3..cc3a939e7a 100644 --- a/macros/latex-dev/required/tools/longtable.dtx +++ b/macros/latex-dev/required/tools/longtable.dtx @@ -27,8 +27,9 @@ \ProvidesFile{longtable.dtx} %</dtx> %<package>\NeedsTeXFormat{LaTeX2e}[1995/06/01] -%<package>\providecommand\DeclareRelease[3]{} -%<package>\providecommand\DeclareCurrentRelease[2]{} +%<package> +% Try the 2020 version for any rollback before that date: +%<package>\DeclareRelease{}{1994-06-01}{longtable-2020-01-07.sty} %<package> %<package>\DeclareRelease{v4.13}{2020-01-02}{longtable-2020-01-07.sty} %<package>\DeclareCurrentRelease{}{2020-02-07} @@ -37,7 +38,7 @@ %<driver> \ProvidesFile{longtable.drv} % \fi % \ProvidesFile{longtable.dtx} - [2023-12-16 v4.19 Multi-page Table package (DPC)] + [2024-04-26 v4.20 Multi-page Table package (DPC)] % % \iffalse %<*driver> diff --git a/macros/latex-dev/required/tools/longtable.pdf b/macros/latex-dev/required/tools/longtable.pdf Binary files differindex c1c37913ff..f0823ed03f 100644 --- a/macros/latex-dev/required/tools/longtable.pdf +++ b/macros/latex-dev/required/tools/longtable.pdf diff --git a/macros/latex-dev/required/tools/multicol-2017-04-11.sty b/macros/latex-dev/required/tools/multicol-2017-04-11.sty index 9e346656bb..bdebc93db9 100644 --- a/macros/latex-dev/required/tools/multicol-2017-04-11.sty +++ b/macros/latex-dev/required/tools/multicol-2017-04-11.sty @@ -1,5 +1,7 @@ %% -%% This is an old release of `multicol.sty', +%% This is an old release of `multicol.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== %% %% The source is maintained by the LaTeX Project team and bug %% reports for it can be opened at http://latex-project.org/bugs.html diff --git a/macros/latex-dev/required/tools/multicol-2019-10-01.sty b/macros/latex-dev/required/tools/multicol-2019-10-01.sty index 221f62f68e..fc8bda5479 100644 --- a/macros/latex-dev/required/tools/multicol-2019-10-01.sty +++ b/macros/latex-dev/required/tools/multicol-2019-10-01.sty @@ -1,6 +1,7 @@ -%% This is a rollback file for multicol to the last version within release 2019-10-01 -%% ======================= %% +%% This is an old release of `multicol.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== %% %% This is file `multicol.sty', %% generated with the docstrip utility. @@ -101,14 +102,6 @@ %% %% Frank.Mittelbach@latex-project.org %% -\NeedsTeXFormat{LaTeX2e}[2018-04-01] - -\providecommand\DeclareRelease[3]{} -\providecommand\DeclareCurrentRelease[2]{} - -\DeclareRelease{}{2017-04-11}{multicol-2017-04-11.sty} -\DeclareCurrentRelease{}{2018-04-01} - \ProvidesPackage{multicol} [2019/12/09 v1.8y multicolumn formatting (FMi)] %% diff --git a/macros/latex-dev/required/tools/multicol.dtx b/macros/latex-dev/required/tools/multicol.dtx index 9c680ab563..4d86448002 100644 --- a/macros/latex-dev/required/tools/multicol.dtx +++ b/macros/latex-dev/required/tools/multicol.dtx @@ -86,11 +86,10 @@ %<*dtx> \ProvidesFile{multicol.dtx} %</dtx> -%<package>\NeedsTeXFormat{LaTeX2e}[2018-04-01] -%<package> -%<package>\providecommand\DeclareRelease[3]{} -%<package>\providecommand\DeclareCurrentRelease[2]{} %<package> +% For any rollback before 2017 load the 2017 version and hope for the best: +%<package>\DeclareRelease{}{1994-06-01}{multicol-2017-04-11.sty} +% %<package>\DeclareRelease{}{2017-04-11}{multicol-2017-04-11.sty} %<package>\DeclareRelease{v1.8}{2019-10-01}{multicol-2019-10-01.sty} %<package>\DeclareCurrentRelease{}{2021-11-15} @@ -99,7 +98,7 @@ %<driver> \ProvidesFile{multicol.drv} % \fi % \ProvidesFile{multicol.dtx} - [2024/01/29 v1.9g multicolumn formatting (FMi)] + [2024/05/23 v1.9h multicolumn formatting (FMi)] % % % diff --git a/macros/latex-dev/required/tools/multicol.pdf b/macros/latex-dev/required/tools/multicol.pdf Binary files differindex dc6ec1cde6..88f6d24fb9 100644 --- a/macros/latex-dev/required/tools/multicol.pdf +++ b/macros/latex-dev/required/tools/multicol.pdf diff --git a/macros/latex-dev/required/tools/rawfonts.pdf b/macros/latex-dev/required/tools/rawfonts.pdf Binary files differindex e2cae3b61d..4b70b5fb34 100644 --- a/macros/latex-dev/required/tools/rawfonts.pdf +++ b/macros/latex-dev/required/tools/rawfonts.pdf diff --git a/macros/latex-dev/required/tools/shellesc.pdf b/macros/latex-dev/required/tools/shellesc.pdf Binary files differindex 290df81741..4a7b48325a 100644 --- a/macros/latex-dev/required/tools/shellesc.pdf +++ b/macros/latex-dev/required/tools/shellesc.pdf diff --git a/macros/latex-dev/required/tools/showkeys-2014-10-28.sty b/macros/latex-dev/required/tools/showkeys-2014-10-28.sty index b4d7b19028..9f465dff5c 100644 --- a/macros/latex-dev/required/tools/showkeys-2014-10-28.sty +++ b/macros/latex-dev/required/tools/showkeys-2014-10-28.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `showkeys.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `showkeys.sty', %% generated with the docstrip utility. %% diff --git a/macros/latex-dev/required/tools/showkeys.dtx b/macros/latex-dev/required/tools/showkeys.dtx index aba96a7eab..b6717950a7 100644 --- a/macros/latex-dev/required/tools/showkeys.dtx +++ b/macros/latex-dev/required/tools/showkeys.dtx @@ -22,16 +22,15 @@ % \fi % \iffalse %% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle -%% File: showkeys.dtx Copyright (C) 2006-2023 David Carlisle, LaTeX Project +%% File: showkeys.dtx Copyright (C) 2006-2024 David Carlisle, LaTeX Project % %<*dtx> \ProvidesFile{showkeys.dtx} %</dtx> %<package>\NeedsTeXFormat{LaTeX2e} %<package> -%<package>\providecommand\DeclareRelease[3]{} -%<package>\providecommand\DeclareCurrentRelease[2]{} -%<package> +% For every rollback request before 2022 use the 2014 version: +%<package>\DeclareRelease{}{1994-06-01}{showkeys-2014-10-28.sty} %<package>\DeclareRelease{}{2014-10-28}{showkeys-2014-10-28.sty} %<package>\DeclareCurrentRelease{}{2022-06-01} %<package> @@ -39,7 +38,7 @@ %<driver> \ProvidesFile{showkeys.drv} % \fi % \ProvidesFile{showkeys.dtx} - [2023/12/16 v3.20 Show cite and label keys (DPC, MH)] + [2024/05/23 v3.21 Show cite and label keys (DPC, MH)] % % \iffalse %<*driver> diff --git a/macros/latex-dev/required/tools/showkeys.pdf b/macros/latex-dev/required/tools/showkeys.pdf Binary files differindex 968476380c..bc179092e4 100644 --- a/macros/latex-dev/required/tools/showkeys.pdf +++ b/macros/latex-dev/required/tools/showkeys.pdf diff --git a/macros/latex-dev/required/tools/somedefs.pdf b/macros/latex-dev/required/tools/somedefs.pdf Binary files differindex 42fe646dfb..350af16103 100644 --- a/macros/latex-dev/required/tools/somedefs.pdf +++ b/macros/latex-dev/required/tools/somedefs.pdf diff --git a/macros/latex-dev/required/tools/tabularx.pdf b/macros/latex-dev/required/tools/tabularx.pdf Binary files differindex 73f2c1bdf2..3a9261846c 100644 --- a/macros/latex-dev/required/tools/tabularx.pdf +++ b/macros/latex-dev/required/tools/tabularx.pdf diff --git a/macros/latex-dev/required/tools/theorem.pdf b/macros/latex-dev/required/tools/theorem.pdf Binary files differindex eb1b723c21..ef3fde6039 100644 --- a/macros/latex-dev/required/tools/theorem.pdf +++ b/macros/latex-dev/required/tools/theorem.pdf diff --git a/macros/latex-dev/required/tools/tools-overview.pdf b/macros/latex-dev/required/tools/tools-overview.pdf Binary files differindex 74db7e1ce1..fc09cbdfb7 100644 --- a/macros/latex-dev/required/tools/tools-overview.pdf +++ b/macros/latex-dev/required/tools/tools-overview.pdf diff --git a/macros/latex-dev/required/tools/trace.pdf b/macros/latex-dev/required/tools/trace.pdf Binary files differindex a2f5e7d4fb..986e0b9765 100644 --- a/macros/latex-dev/required/tools/trace.pdf +++ b/macros/latex-dev/required/tools/trace.pdf diff --git a/macros/latex-dev/required/tools/varioref-2016-02-16.sty b/macros/latex-dev/required/tools/varioref-2016-02-16.sty index 747e89dc60..39cc4467a7 100644 --- a/macros/latex-dev/required/tools/varioref-2016-02-16.sty +++ b/macros/latex-dev/required/tools/varioref-2016-02-16.sty @@ -1,4 +1,8 @@ %% +%% This is an old release of `varioref.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% %% This is file `varioref.sty', %% generated with the docstrip utility. %% diff --git a/macros/latex-dev/required/tools/varioref.dtx b/macros/latex-dev/required/tools/varioref.dtx index f25c524188..40b3038074 100644 --- a/macros/latex-dev/required/tools/varioref.dtx +++ b/macros/latex-dev/required/tools/varioref.dtx @@ -33,14 +33,15 @@ %% % %<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16] -%<package>\providecommand\DeclareRelease[3]{} -%<package>\providecommand\DeclareCurrentRelease[2]{} %<package> +% +% For any rollback before 2019 load the 2016 version and hope for the best: +%<package>\DeclareRelease{}{1994-06-01}{varioref-2016-02-16.sty} %<package>\DeclareRelease{}{2016-02-16}{varioref-2016-02-16.sty} %<package>\DeclareCurrentRelease{}{2019-10-01} %<package> %<package>\ProvidesPackage{varioref} -%<package> [2024/01/15 v1.6f package for extended references (FMi)] +%<package> [2024/05/23 v1.6g package for extended references (FMi)] % \fi % %% diff --git a/macros/latex-dev/required/tools/varioref.pdf b/macros/latex-dev/required/tools/varioref.pdf Binary files differindex a398d5ff05..3888f90501 100644 --- a/macros/latex-dev/required/tools/varioref.pdf +++ b/macros/latex-dev/required/tools/varioref.pdf diff --git a/macros/latex-dev/required/tools/verbatim.pdf b/macros/latex-dev/required/tools/verbatim.pdf Binary files differindex d2bd345190..6158390d2b 100644 --- a/macros/latex-dev/required/tools/verbatim.pdf +++ b/macros/latex-dev/required/tools/verbatim.pdf diff --git a/macros/latex-dev/required/tools/xr-2023-07-04.sty b/macros/latex-dev/required/tools/xr-2023-07-04.sty new file mode 100644 index 0000000000..15bfde169a --- /dev/null +++ b/macros/latex-dev/required/tools/xr-2023-07-04.sty @@ -0,0 +1,84 @@ +%% +%% This is an old release of `xr.sty' used during rollback operations. +%% Do not use this file directly. +%% ============================== +%% +%% This is file `xr.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% xr.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% The source is maintained by the LaTeX Project team and bug +%% reports for it can be opened at https://latex-project.org/bugs/ +%% (but please observe conditions on bug reports sent to that address!) +%% +%% +%% Copyright (C) 1993-2023 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. +%% +%% This file was generated from file(s) of the Standard LaTeX `Tools Bundle'. +%% -------------------------------------------------------------------------- +%% +%% It 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. +%% The latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This file may only be distributed together with a copy of the LaTeX +%% `Tools Bundle'. You may however distribute the LaTeX `Tools Bundle' +%% without such generated files. +%% +%% The list of all files belonging to the LaTeX `Tools Bundle' is +%% given in the file `manifest.txt'. +%% +%% File: xr.dtx Copyright (C) 1993-2019 David Carlisle +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{xr} + [2023-07-04 v5.06 eXternal References (DPC)] +\def\externaldocument{\@ifnextchar[\XR@{\XR@[]}} +\let\externalcitedocument\externaldocument +\def\XR@[#1]#2{{% + \makeatletter + \def\XR@prefix{#1}% + \set@curr@file{#2}% + \expandafter\XR@next\@curr@file.aux\relax\\}} +\def\XR@next#1\relax#2\\{% + \edef\XR@list{#2}% + \XR@loop{#1}} +\def\XR@aux{% + \ifx\XR@list\@empty\else\expandafter\XR@explist\fi} + +\def\XR@explist{\expandafter\XR@next\XR@list\\} +\def\XR@loop#1{\openin\@inputcheck{#1}\relax + \ifeof\@inputcheck + \PackageWarning{xr}{^^JNo file #1^^JLABELS NOT IMPORTED.^^J}% + \expandafter\XR@aux + \else + \PackageInfo{xr}{IMPORTING LABELS FROM #1}% + \expandafter\XR@read\fi} +\def\XR@read{% + \read\@inputcheck to\XR@line + \expandafter\XR@test\XR@line...\XR@} +\long\def\XR@test#1#2#3#4\XR@{% + \let\XR@tempa\@gobbletwo + \ifx#1\newlabel + \let\XR@tempa\@firstoftwo + \else\ifx#1\bibcite + \let\XR@tempa\@firstoftwo + \else\ifx#1\@input + \let\XR@tempa\@secondoftwo + \fi\fi\fi + \XR@tempa{#1{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}% + \ifeof\@inputcheck\expandafter\XR@aux + \else\expandafter\XR@read\fi} +\endinput +%% +%% End of file `xr.sty'. diff --git a/macros/latex-dev/required/tools/xr.dtx b/macros/latex-dev/required/tools/xr.dtx index 3914cebcd9..daa0778b36 100644 --- a/macros/latex-dev/required/tools/xr.dtx +++ b/macros/latex-dev/required/tools/xr.dtx @@ -21,14 +21,49 @@ % % \fi % \iffalse -%% File: xr.dtx Copyright (C) 1993-2019 David Carlisle +%% File: xr.dtx Copyright (C) 1993-2024 David Carlisle % %<package>\NeedsTeXFormat{LaTeX2e} +%<package>\DeclareRelease{v5}{2023-07-04}{xr-2023-07-04.sty} +%<package>\DeclareCurrentRelease{}{2024-04-10} %<package>\ProvidesPackage{xr} -%<package> [2023-07-04 v5.06 eXternal References (DPC)] +%<package> [2024-04-10 v6.00 eXternal References (DPC)] % %<*driver> -\documentclass{ltxdoc} +\documentclass{l3doc} +% currently missing in l3doc, copied from array.dtx +\makeatletter +\def\MaintainedBy#1{\gdef\@maintainedby{#1}} +\let\@maintainedby\@empty +\def\MaintainedByLaTeXTeam#1{% +{\gdef\@maintainedby{% +This file is maintained by the \LaTeX{} Project team.\\% +Bug reports can be opened (category \texttt{#1}) at\\% +\url{https://latex-project.org/bugs.html}.}}} +\def\@maketitle{% + \newpage + \null + \vskip 2em% + \begin{center}% + \let \footnote \thanks + {\LARGE \@title \par}% + \vskip 1.5em% + {\large + \lineskip .5em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip 1em% + {\large \@date}% + \ifx\@maintainedby\@empty + \else + \vskip 1em% + \fbox{\fbox{\begin{tabular}{@{}l@{}}\@maintainedby\end{tabular}}}% + \fi + \end{center}% + \par + \vskip 1.5em} +\makeatother \usepackage{xr} \GetFileInfo{xr.sty} \begin{document} @@ -50,44 +85,113 @@ % % \changes{v5.00}{1993/07/07} % {First DPC version (by agreement with J-PD). New mechanism -% (\cmd{\read} instead of \cmd\input).} +% (\cs{read} instead of \cs{input}).} % % \changes{v5.01}{1993/07/20}{Fix bug added by DPC, v5.00 did not import -% aux files of \cmd\include'ed files. (Reported by J-PD)} +% aux files of \cs{include}'ed files. (Reported by J-PD)} % % \changes{v5.02}{1994/05/28}{Update for LaTeX2e} % \changes{v5.03}{2018/10/01}{Fix for conditionals in aux file} % \changes{v5.05}{2019/07/20}{include xcite} +% \changes{v6.00}{2024/04/10}{merge with xr-hyper} % % % This package implements a system for eXternal References. -% +% Version 6.00 merges the \pkg{xr} package and the \pkg{xr-hyper} package. +% \pkg{xr-hyper} was developed to support the +% extended label syntax of the \pkg{hyperref} package and to enable active links +% to the external documents. +% In the \LaTeX{} release 2023-06-01 the label syntax of \pkg{hyperref} +% and the \LaTeX{} kernel have been synchronized and there is no longer +% a need for two packages. The package \pkg{xr-hyper} will be +% deprecated. +% +% The previous version before the merge can be accessed with +% \begin{verbatim} +% \usepackage{xr}[=v5] +% \end{verbatim} +% or with a rollback date between 2023-07-04 and 2024-04-09 +% \begin{verbatim} +% \usepackage{xr}[=2024-04-09] +% \end{verbatim} +% +% \section{Usage} +% +% \begin{syntax} +% \cs{externaldocument}\oarg{prefix}\texttt[nocite\texttt]\marg{document}\oarg{url} +% \end{syntax} +% % If one document needs to refer to sections of another, say |aaa.tex|, % then this package may be loaded in the main file, and the command\\ % |\externaldocument{aaa}|\\ % given in the preamble. % -% Then you may use |\ref| and |\pageref| to refer to anything which has +% Then you may use |\ref| and |\pageref| (or |\nameref| if the +% package \pkg{nameref} has been loaded to refer to anything which has % been given a |\label| in either |aaa.tex| or the main document. +% It is also possible to refer to properties stored with \cs{RecordProperties}. % You may declare any number of such external documents. % % If any of the external documents, or the main document, use the same % |\label| then an error will occur as the label will be multiply % defined. To overcome this problem |\externaldocument| has an optional -% argument. If you declare |\externaldocument[A-]{aaa}|, then all +% argument \meta{prefix}. +% If you declare |\externaldocument[A-]{aaa}|, then all % references from |aaa| are prefixed by |A-|. So for instance, if a % section of |aaa| had |\label{intro}|, then this could be referenced % with |\ref{A-intro}|. The prefix need not be |A-|, it can be any % string chosen to ensure that all the labels imported from external -% files are unique. Note however that if your style declares certain -% active characters (|:| in French, |"| in German) then these -% characters can not usually be used in |\label|, and similarly may not -% be used in the optional argument to |\externaldocument|. +% files are unique. Note however that the prefix is expanded and +% so should not contain commands that are not safe in this context. % % As first suggested in Enrico Gregorio's |xcite| package, the current version % also allows |\cite| to reference |\bibitem| in the external document. % For compatibility with |xcite|, |\externalcitedocument| is made available % as an alias for |\externaldocument| +% +% Many packages have variant citation commands (natbib, +% biblatex,....) and the external document may or may not have used +% hyperref. Because of these differences the citation linking may not +% always work, it can be disabled by specifying \texttt{[nocite]} after the +% \meta{prefix}: +% \begin{verbatim} +% \externaldocument[][nocite]{aaa} +% \end{verbatim} +% +% The `document' referred to by the main argument \meta{document} is the file +% \file{document.aux} which must be somewhere on TeX's input path. +% Some packages (eg hyperref) really need to know the location of the +% final document rather than the aux file. By default this is assumed +% to be \file{document.pdf}. A package may redefine the command \cs{XR@ext} to +% change this default extension. However sometimes the final +% document may be in a position unrelated to the aux file, or the +% browser may not be able to find files at an arbitrary point in +% TeX's input path, so the final optional argument \meta{url} allows a full +% URL to the final document to be specified. +% \begin{verbatim} +% \externaldocument{aaa}[https://example.com/this/path/to/aaa.pdf] +% \end{verbatim} +% +% The package stores the url of the external document in the label data. It can +% e.g. be retrieved with the \pkg{refcount} package +% +% \begin{verbatim} +% \usepackage{refcount,xr} +% \externaldocument{aaa} +% ... +% \getrefbykeydefault{intro}{url}{??} %prints aaa.pdf or ?? +% \end{verbatim} +% +% \pkg{xr} supports also the properties introduced in \LaTeX{} 2023-11-01. +% Here the url of the external document is stored in the \texttt{xr-url} property. +% +% \begin{verbatim} +% \usepackage{xr} +% \externaldocument{aaa} %aaa contains \RecordProperties{intro}{page} +% ... +% \RefProperty{intro}{page} %gives page number +% \RefProperty{intro}{xr-url} %gives aaa.pdf +% \end{verbatim} % % \MaybeStop{} % @@ -98,20 +202,74 @@ % \end{macrocode} % % Check for the optional argument. +% \changes{v6.00}{2024-04-10}{Copied over extended definition of xr-hyper} % \begin{macrocode} -\def\externaldocument{\@ifnextchar[\XR@{\XR@[]}} +\def\externaldocument{\@testopt\XR@cite{}} \let\externalcitedocument\externaldocument +\def\XR@cite[#1]{\@testopt{\XR@[#1]}{}} +\def\XR@[#1][#2]#3{\@testopt{\XR@@{#1}{#2}{#3}}{#3.\XR@ext}} +% \end{macrocode} +% +% \subsection{helper definitions} +% \changes{v6.00}{2024-04-10}{new, copied over from xr-hyper} +% To test the second optional argument +% \begin{macrocode} +\def\XR@@nocite{nocite} +% \end{macrocode} +% Needed in the processing +% \begin{macrocode} +\long\def\@gobblefour #1#2#3#4{} +\long\def\@firstoffour #1#2#3#4{#1} +\long\def\@secondoffour#1#2#3#4{#2} +\long\def\@thirdoffour #1#2#3#4{#3} +\long\def\@fourthoffour #1#2#3#4{#4} +% \end{macrocode} +% The url is added as fifth argument. The command used here is +% \cs{XR@addURL}. The command is more complicated as needed +% as it tries to handle also older documents with +% \cs{newlabel}'s with two arguments. +% \begin{macrocode} +\def\XR@addURL#1{\XR@@dURL#1{}{}{}{}\\} +\def\XR@@dURL#1#2#3#4#5\\{% + \unexpanded{{#1}{#2}{#3}{#4}}{\XR@URL}% + }% +% \end{macrocode} +% +% \subsection{Variables} +% \changes{v6.00}{2024-04-10}{new, copied over from xr-hyper} +% Default file extension: +% \begin{macrocode} +\providecommand\XR@ext{pdf} % \end{macrocode} % -% Save the optional prefix. Start processing the first |aux| file. -% \changes{v5.06}{2020-05-10}{Remove leading and trailing sapces from +% Save the optional prefix. Start processing the first |aux| file. +% \changes{v6.00}{2024-04-10}{copied over the new extended internal command from xr-hyper. +% It prepends the directory name.} +% Olivier Michel pointed out that +% if the aux file was not on texinputs you could not always go +% \cs{externaldocument}{/some/path/to/file} +% specifically that worked if file.aux was a `simple' document with +% one aux file, but if \cs{include} had been used, the `sub' aux files +% would not be found by xr in the remote directory. +% This version calls \cs{filename@parse} to get the directory name of the +% remote directory, which is then explicitly prepended to the names of +% any included aux files. +% \changes{v5.06}{2020-05-10}{Remove leading and trailing spaces from % the filename (gh/2223)} % \begin{macrocode} -\def\XR@[#1]#2{{% +\def\XR@@#1#2#3[#4]{{% \makeatletter \def\XR@prefix{#1}% - \set@curr@file{#2}% - \expandafter\XR@next\@curr@file.aux\relax\\}} + \def\XR@nocite{#2}% + \ifx\XR@nocite\XR@@nocite + \let\XR@bibcite\vadjust + \else + \let\XR@bibcite\bibcite + \fi + \def\XR@URL{#4}% + \set@curr@file{#3}% + \filename@parse\@curr@file + \XR@next\@curr@file.aux\relax\\}} % \end{macrocode} % % Process the next |aux| file in the list and remove it from the head of @@ -161,23 +319,40 @@ % \end{macrocode} % % Look at the first token of the line. -% If it is |\newlabel|, do the |\newlabel|. If it is |\@input|, add the -% filename to the list of files to process. Otherwise ignore. +% If it is |\newlabel|, define \cs{r@}\meta{label}, ensure that it has +% five label data argument and add the url as the last one. +% If it is |\@input|, add the +% filename to the list of files to process. +% If it is |\bibcite|, call a |\bibcite|. +% If it is |\new@label@record| add the url and then call it. +% Otherwise ignore. % Go around the loop if not at end of file. Finally process the next % file in the list. % % 2018 update: make sure the arguments are handled outside the |\ifx| test, +% \changes{v6.00}{2024-04-10}{copied over extended definition from xr-hyper} % \begin{macrocode} \long\def\XR@test#1#2#3#4\XR@{% - \let\XR@tempa\@gobbletwo + \let\XR@tempa\@gobblefour \ifx#1\newlabel - \let\XR@tempa\@firstoftwo - \else\ifx#1\bibcite - \let\XR@tempa\@firstoftwo + \let\XR@tempa\@firstoffour + \else\ifx#1\XR@bibcite + \let\XR@tempa\@secondoffour \else\ifx#1\@input - \let\XR@tempa\@secondoftwo - \fi\fi\fi - \XR@tempa{#1{\XR@prefix#2}{#3}}{\edef\XR@list{\XR@list#2\relax}}% + \let\XR@tempa\@thirdoffour + \else\ifx#1\new@label@record + \let\XR@tempa\@fourthoffour + \fi\fi\fi\fi + \XR@tempa + {% + \expandafter\protected@xdef\csname r@\XR@prefix#2\endcsname{\XR@addURL{#3}}% + }% + {\expandafter\bibcite\expandafter{\XR@prefix#2}{#3}}% + {\edef\XR@list{\XR@list\filename@area#2\relax}}% + {% + \edef\next{\noexpand\new@label@record{\XR@prefix#2}{\unexpanded{#3}{xr-url}{\XR@URL}}}% + \next + } \ifeof\@inputcheck\expandafter\XR@aux \else\expandafter\XR@read\fi} % \end{macrocode} diff --git a/macros/latex-dev/required/tools/xr.pdf b/macros/latex-dev/required/tools/xr.pdf Binary files differindex 3a7be5445a..1c051e4a12 100644 --- a/macros/latex-dev/required/tools/xr.pdf +++ b/macros/latex-dev/required/tools/xr.pdf diff --git a/macros/latex-dev/required/tools/xspace.pdf b/macros/latex-dev/required/tools/xspace.pdf Binary files differindex 51de3e2c87..cacc2639aa 100644 --- a/macros/latex-dev/required/tools/xspace.pdf +++ b/macros/latex-dev/required/tools/xspace.pdf |