Skip to content

Commit

Permalink
s/5.2.0/5.3.0 in various code comments as #10759 got merged in 5.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jfbu committed Oct 12, 2022
1 parent 3deb527 commit b5ba1ed
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,%
Expand Down
8 changes: 4 additions & 4 deletions doc/latex.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions doc/usage/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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'``...
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sphinx/texinputs/sphinx.sty
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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{%
Expand Down
18 changes: 9 additions & 9 deletions sphinx/texinputs/sphinxlatextables.sty
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ---
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}).
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sphinx/texinputs/sphinxpackagefootnote.sty
Original file line number Diff line number Diff line change
@@ -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
Expand Down

1 comment on commit b5ba1ed

@jfbu
Copy link
Contributor Author

@jfbu jfbu commented on b5ba1ed Oct 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing failed on Windows for test_gettext_dont_rebuild_mo but I don't see how this can related to this commit

Please sign in to comment.