From b5ba1ede2ab62ea566b5ab944a4ccd9b1c2eecdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20B?= <2589111+jfbu@users.noreply.github.com> Date: Wed, 12 Oct 2022 17:41:39 +0200 Subject: [PATCH] s/5.2.0/5.3.0 in various code comments as #10759 got merged in 5.3.0 --- doc/conf.py | 2 +- doc/latex.rst | 8 ++++---- doc/usage/configuration.rst | 4 ++-- sphinx/texinputs/sphinx.sty | 4 ++-- sphinx/texinputs/sphinxlatextables.sty | 18 +++++++++--------- sphinx/texinputs/sphinxpackagefootnote.sty | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index fc7959d4dca..ec845bec8e7 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -78,7 +78,7 @@ {\begin{sphinxtheindex}\end{sphinxtheindex}} ''', 'sphinxsetup': """% -VerbatimColor=black!5,% tests 5.2.0 extended syntax +VerbatimColor=black!5,% tests 5.3.0 extended syntax VerbatimBorderColor={RGB}{32,32,32},% pre_border-radius=3pt,% pre_box-decoration-break=slice,% diff --git a/doc/latex.rst b/doc/latex.rst index e467ac4e9a8..e8fcb95f84c 100644 --- a/doc/latex.rst +++ b/doc/latex.rst @@ -840,7 +840,7 @@ Do not use quotes to enclose values, whether numerical or strings. .. _xcolor: https://ctan.org/pkg/xcolor - .. versionchanged:: 5.2.0 + .. versionchanged:: 5.3.0 Formerly only the ``\definecolor`` syntax was accepted. ``TitleColor`` @@ -896,7 +896,7 @@ Do not use quotes to enclose values, whether numerical or strings. There is also ``TableMergeColorHeader``. If used, sets a specific colour for merged single-row cells in the header. - .. versionadded:: 5.2.0 + .. versionadded:: 5.3.0 ``TableRowColorOdd`` Sets the background colour for odd rows in tables (the row count starts at @@ -908,7 +908,7 @@ Do not use quotes to enclose values, whether numerical or strings. There is also ``TableMergeColorOdd``. - .. versionadded:: 5.2.0 + .. versionadded:: 5.3.0 ``TableRowColorEven`` Sets the background colour for even rows in tables. @@ -917,7 +917,7 @@ Do not use quotes to enclose values, whether numerical or strings. There is also ``TableMergeColorEven``. - .. versionadded:: 5.2.0 + .. versionadded:: 5.3.0 ``verbatimsep`` The separation between code lines and the frame. diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst index b2196a9e5af..790c18e5a37 100644 --- a/doc/usage/configuration.rst +++ b/doc/usage/configuration.rst @@ -2256,7 +2256,7 @@ These options influence LaTeX output. Default: ``[]`` - .. versionadded:: 5.2.0 + .. versionadded:: 5.3.0 If using ``'booktabs'`` or ``'borderless'`` it seems recommended to also opt for ``'colorrows'``... @@ -2322,7 +2322,7 @@ These options influence LaTeX output. to add ``r'\usepackage{booktabs}'`` to the LaTeX preamble. On the other hand one can use ``colorrows`` class for individual tables - with no extra package (as Sphinx since 5.2.0 always loads colortbl_). + with no extra package (as Sphinx since 5.3.0 always loads colortbl_). .. _booktabs: https://ctan.org/pkg/booktabs .. _colortbl: https://ctan.org/pkg/colortbl diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 748f8b977b1..0ac55cc495b 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -6,7 +6,7 @@ % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sphinx}[2022/08/15 v5.2.0 LaTeX package (Sphinx markup)] +\ProvidesPackage{sphinx}[2022/08/15 v5.3.0 LaTeX package (Sphinx markup)] % provides \ltx@ifundefined % (many packages load ltxcmds: graphicx does for pdftex and lualatex but @@ -90,7 +90,7 @@ {\expandafter\let\csname\@backslashchar color@#1\expandafter\endcsname \csname\@backslashchar color@#2\endcsname } -% (5.2.0) allow colour options to use both the \definecolor and the \colorlet +% (5.3.0) allow colour options to use both the \definecolor and the \colorlet % syntaxes, for example VerbatimColor={gray}{0.9} or VerbatimColor=red!10 % In the latter case we need the real \colorlet from xcolor package. \def\spx@defineorletcolor#1{% diff --git a/sphinx/texinputs/sphinxlatextables.sty b/sphinx/texinputs/sphinxlatextables.sty index 247ad7a7674..fee7b16bc62 100644 --- a/sphinx/texinputs/sphinxlatextables.sty +++ b/sphinx/texinputs/sphinxlatextables.sty @@ -68,7 +68,7 @@ % \spx@arrayrulewidth is used internally and its meaning will be set according % to the table type; no extra user code should modify it. In particular any % \setlength{\spx@arrayrulewidth}{...} may break all of LaTeX... (really...) -\def\spx@arrayrulewidth{\arrayrulewidth}% 5.2.0, to be adjusted by each table +\def\spx@arrayrulewidth{\arrayrulewidth}% 5.3.0, to be adjusted by each table % using here T (for Tabulary) feels less of a problem than the X could be \newcolumntype{T}{J}% % For tables allowing pagebreaks @@ -193,7 +193,7 @@ % NOTA BENE: since the multicolumn and multirow code was written Sphinx % decided to prefix non public internal macros by \spx@ and in fact all % such macros here should now be prefixed by \spx@table@, but doing the -% update is delayed to later. (written at 5.2.0) +% update is delayed to later. (written at 5.3.0) %%%%%%%%%%%%%%%%%%%%% % --- MULTICOLUMN --- @@ -236,7 +236,7 @@ % \arrayrulewidth space for each column separation in its estimate of available % width). % -% Update at 5.2.0: code uses \spx@arrayrulewidth which is kept in sync with the +% Update at 5.3.0: code uses \spx@arrayrulewidth which is kept in sync with the % table column specification (aka preamble): % - no | in preamble: \spx@arrayrulewidth -> \z@ % - at least a | in the preamble: \spx@arrayrulewidth -> \arrayrulewidth @@ -267,7 +267,7 @@ % Sphinx generates no nested tables, and if some LaTeX macro uses internally a % tabular this will not have a \sphinxstartmulticolumn within it! % -% 5.2.0 adds a check for multirow as single-row multi-column will allow a row +% 5.3.0 adds a check for multirow as single-row multi-column will allow a row % colour but multi-row multi-column should not. % Attention that this assumes \sphinxstartmulticolumn is always followed % in latex mark-up either by \sphinxmultirow or \begin (from \begin{varwidth}). @@ -431,13 +431,13 @@ % to row color for the duration of the Sphinx multicolumn... the (provisional?) % choice has been made to cancel the colortbl colours for the multicolumn % duration. -% Sphinx 5.2.0 comment: +% Sphinx 5.3.0 comment: % - colortbl has no mechanism to disable colour background in a given cell: % \cellcolor triggers one more \color, but has no possibility to revert % a previously emitted \color, only to override it via an additional \color -% - prior to <5.2.0, Sphinx did not officially support colour in tables, +% - prior to 5.3.0, Sphinx did not officially support colour in tables, % but it did have a mechanism to protect merged cells from being partly -% covered by colour panels at various places. At 5.2.0 this mechanism +% covered by colour panels at various places. At 5.3.0 this mechanism % is relaxed a bit to allow row colour for a single-row merged cell. % % fixcolorpanel @@ -480,7 +480,7 @@ } \def\spx@CT@setup@nocolor#1\endgroup{% \global\let\CT@cell@color\relax - % the above fix was added at 5.2.0 + % the above fix was added at 5.3.0 % formerly a \cellcolor added by a raw latex directive in the merged cell % would have caused colour to apply to the *next* cell after the merged % one; we don't support \cellcolor from merged cells contents anyhow. @@ -551,7 +551,7 @@ % The colour issue is "solved" by clearing colour panels in all cells, % whether or not the multirow is single-column or multi-column. % -% MEMO at 5.2.0: to allow a multirow cell in a single column to react to +% MEMO at 5.3.0: to allow a multirow cell in a single column to react to % \columncolor correctly, it seems only way is that the contents % are inserted by bottom cell (this is mentioned in multirow.sty doc, too). % Sphinx could at Python level "move" the contents to that cell. But the diff --git a/sphinx/texinputs/sphinxpackagefootnote.sty b/sphinx/texinputs/sphinxpackagefootnote.sty index 39d8cfacf20..55901234df1 100644 --- a/sphinx/texinputs/sphinxpackagefootnote.sty +++ b/sphinx/texinputs/sphinxpackagefootnote.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{sphinxpackagefootnote}% - [2022/08/15 v5.2.0 Sphinx custom footnotehyper package (Sphinx team)] + [2022/08/15 v5.3.0 Sphinx custom footnotehyper package (Sphinx team)] %% %% Package: sphinxpackagefootnote %% Version: based on footnotehyper.sty 2021/02/04 v1.1d