From 19f9aac5902eddd1876991ecd8590aeb1a7213a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20B?= <2589111+jfbu@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:38:58 +0200 Subject: [PATCH] LaTeX: fix #10650 via usage of our own sophisticated \fcolorbox --- sphinx/texinputs/sphinxlatexadmonitions.sty | 27 ++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/sphinx/texinputs/sphinxlatexadmonitions.sty b/sphinx/texinputs/sphinxlatexadmonitions.sty index ca6aa66288..e70080d1dc 100644 --- a/sphinx/texinputs/sphinxlatexadmonitions.sty +++ b/sphinx/texinputs/sphinxlatexadmonitions.sty @@ -66,6 +66,27 @@ \definecolor{sphinxtipBgColor}{rgb}{1,1,1} % Others get more distinction +\def\spx@admonitions@boxes@fcolorbox@init{% + \spx@boxes@border@top \FrameRule + \spx@boxes@border@right \FrameRule + \spx@boxes@border@bottom\FrameRule + \spx@boxes@border@left \FrameRule + % + \spx@boxes@padding@top \FrameSep + \spx@boxes@padding@right \FrameSep + \spx@boxes@padding@bottom\FrameSep + \spx@boxes@padding@left \FrameSep + % + \spx@boxes@shadow@xoffset\sphinxshadowsize + \spx@boxes@shadow@yoffset\sphinxshadowsize + % + \spx@boxes@noshadowtrue % no shadow + \spx@boxes@noshadowcolortrue + \spx@boxes@nobackgroundcolorfalse + \sphinxcolorlet{spx@boxes@backgroundcolor}{spx@notice@bgcolor}% + \spx@boxes@nobordercolorfalse + \sphinxcolorlet{spx@boxes@bordercolor}{spx@notice@bordercolor}% +}% % Code adapted from framed.sty's "snugshade" environment. % Nesting works (inner frames do not allow page breaks). \newenvironment{sphinxheavybox}{\par @@ -80,10 +101,14 @@ % revert a skip done by framed before the frame. \ltx@ifundefined{OuterFrameSep}{}{\OuterFrameSep\z@skip}% \vspace{\FrameHeightAdjust} + % this will in particular set up colors, formerly passed as first + % two arguments of \fcolorbox + \let\spx@boxes@fcolorbox@init\spx@admonitions@boxes@fcolorbox@init % copied/adapted from framed.sty's snugshade + % but now using in place of \fcolorbox the Sphinx sophisticated own \def\FrameCommand##1{\hskip\@totalleftmargin \fboxsep\FrameSep \fboxrule\FrameRule - \fcolorbox{spx@notice@bordercolor}{spx@notice@bgcolor}{##1}% + \spx@boxes@fcolorbox{##1}% \hskip-\linewidth \hskip-\@totalleftmargin \hskip\columnwidth}% \savenotes % use a minipage if we are already inside a framed environment