IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #10633 LaTeX: upstream framed.sty color leak bug

Browse Source
This commit is contained in:
Jean-François B 2022-07-03 14:42:26 +02:00
parent 5ffe1e879e
commit 2ac802fbd4
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -38,6 +38,9 @@ Bugs fixed
* #10566: HTML Theme: Fix enable_search_shortcuts does not work * #10566: HTML Theme: Fix enable_search_shortcuts does not work
* #8686: LaTeX: Text can fall out of code-block at end of page and leave artifact * #8686: LaTeX: Text can fall out of code-block at end of page and leave artifact
on next page on next page
* #10633: LaTeX: user injected ``\color`` commands in topic or admonition boxes may
cause color leaks in PDF due to upstream `framed.sty <https://ctan.org/pkg/framed>`_
bug
* #10579: i18n: UnboundLocalError is raised on translating raw directive * #10579: i18n: UnboundLocalError is raised on translating raw directive
* #9577, #10088: py domain: Fix warning for duplicate Python references when * #9577, #10088: py domain: Fix warning for duplicate Python references when
using ``:any:`` and autodoc. using ``:any:`` and autodoc.

4
sphinx/texinputs/sphinxlatexadmonitions.sty
View File

@ -1,7 +1,7 @@
%% NOTICES AND ADMONITIONS %% NOTICES AND ADMONITIONS
% %
% change this info string if making any custom modification % change this info string if making any custom modification
\ProvidesFile{sphinxlatexadmonitions.sty}[2021/01/27 admonitions] \ProvidesFile{sphinxlatexadmonitions.sty}[2022/07/03 admonitions]
% Provides support for this output mark-up from Sphinx latex writer: % Provides support for this output mark-up from Sphinx latex writer:
% %
@ -103,9 +103,11 @@
\let\@listdepth\@mplistdepth \@mplistdepth\z@ \let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore \@minipagerestore
\@setminipage }% \@setminipage }%
\color@begingroup % workaround to an upstream framed.sty bug
} }
{% {%
\par\unskip \par\unskip
\color@endgroup % matches the \color@begingroup
\@minipagefalse \@minipagefalse
\endMakeFramed \endMakeFramed
\ifspx@inframed\end{minipage}\fi \ifspx@inframed\end{minipage}\fi

4
sphinx/texinputs/sphinxlatexliterals.sty
View File

@ -1,7 +1,7 @@
%% LITERAL BLOCKS %% LITERAL BLOCKS
% %
% change this info string if making any custom modification % change this info string if making any custom modification
\ProvidesFile{sphinxlatexliterals.sty}[2022/06/30 code-blocks and parsed literals] \ProvidesFile{sphinxlatexliterals.sty}[2022/07/03 code-blocks and parsed literals]
% Provides support for this output mark-up from Sphinx latex writer: % Provides support for this output mark-up from Sphinx latex writer:
% %
@ -742,11 +742,13 @@
% never reset, and it issues \@minipagefalse repeatedly (from \@setminipage). % never reset, and it issues \@minipagefalse repeatedly (from \@setminipage).
% As fancyvrb Verbatim will do \@minipagefalse itself, let's simplify things. % As fancyvrb Verbatim will do \@minipagefalse itself, let's simplify things.
\everypar{}% \everypar{}%
\color@begingroup % protect against color leaks (upstream framed.sty bug)
% will fetch its optional arguments if any % will fetch its optional arguments if any
\OriginalVerbatim \OriginalVerbatim
} }
{% {%
\endOriginalVerbatim \endOriginalVerbatim
\color@endgroup % matches the \color@begingroup
\ifspx@inframed \ifspx@inframed
\egroup % finish \sphinxVerbatim@ContentsBox vbox \egroup % finish \sphinxVerbatim@ContentsBox vbox
\nobreak % update page totals \nobreak % update page totals

4
sphinx/texinputs/sphinxlatexshadowbox.sty
View File

@ -1,7 +1,7 @@
%% TOPIC AND CONTENTS BOXES %% TOPIC AND CONTENTS BOXES
% %
% change this info string if making any custom modification % change this info string if making any custom modification
\ProvidesFile{sphinxlatexshadowbox.sty}[2022/06/30 sphinxShadowBox] \ProvidesFile{sphinxlatexshadowbox.sty}[2022/07/03 sphinxShadowBox]
% Provides support for this output mark-up from Sphinx latex writer: % Provides support for this output mark-up from Sphinx latex writer:
% %
@ -138,9 +138,11 @@
\@minipagerestore \@minipagerestore
\@setminipage \@setminipage
}% }%
\color@begingroup % workaround upstream framed.sty bug
}% }%
{% insert the "endminipage" code {% insert the "endminipage" code
\par\unskip \par\unskip
\color@endgroup % matches the \color@begingroup
\@minipagefalse \@minipagefalse
\endMakeFramed \endMakeFramed
\ifspx@inframed\end{minipage}\fi \ifspx@inframed\end{minipage}\fi