diff --git a/doc/latex.rst b/doc/latex.rst index f4fac96776c..5ad2a83a602 100644 --- a/doc/latex.rst +++ b/doc/latex.rst @@ -586,19 +586,19 @@ start of the chapter:: \begingroup \sphinxsetup{% - pre_border-width=2pt, - pre_padding=5pt, + pre_border-width=2pt,% alias name of verbatimborder + pre_padding=5pt,% alias name of verbatimsep pre_border-radius=5pt, pre_background-TeXcolor={named}{OldLace}, pre_border-TeXcolor={named}{Gold}, TitleColor={named}{DarkGoldenrod}, hintBorderColor={named}{LightCoral}, - attentionborder=3pt, - attentionBorderColor={named}{Crimson}, - attentionBgColor={named}{FloralWhite}, + attentionborder=3pt,% or div.attention_border-width + attentionBorderColor={named}{Crimson},% div.attention_border-TeXcolor + attentionBgColor={named}{FloralWhite},% div.attention_background-TeXcolor noteborder=2pt, noteBorderColor={named}{Olive}, - div.caution_border-width=3pt, + div.caution_border-width=3pt,% alias for cautionborder div.caution_border-TeXcolor={named}{Cyan}, div.caution_background-TeXcolor={named}{LightCyan}% } diff --git a/sphinx/texinputs/sphinxlatexliterals.sty b/sphinx/texinputs/sphinxlatexliterals.sty index 68c9523f42b..35fc9ca9fb5 100644 --- a/sphinx/texinputs/sphinxlatexliterals.sty +++ b/sphinx/texinputs/sphinxlatexliterals.sty @@ -62,9 +62,6 @@ % Skip to next page if not enough space at bottom \RequirePackage{needspace} -\newbox\spx@tempboxa -\newbox\spx@tempboxb - % Based on use of "fancyvrb.sty"'s Verbatim. % - with framing allowing page breaks ("framed.sty") % - with breaking of long lines (exploits Pygments mark-up), @@ -121,9 +118,6 @@ % it will arrive here already transformed into horizontal boxes, % interline penalties and glues. % -% TODO: "open borders" at page breaks via First, Mid, Last "frame commands" -% passing the information here to set the -% \spx@boxes@border@{bottom,top} to zero appropriately \long\def\spx@verb@FrameCommand #1#2#3{% % These \hskips are for fancyvrb.sty measuring and will make the % framing "adapt" to an indented context. diff --git a/sphinx/texinputs/sphinxpackageboxes.sty b/sphinx/texinputs/sphinxpackageboxes.sty index 14d4eb1ed3f..befddf6c1fb 100644 --- a/sphinx/texinputs/sphinxpackageboxes.sty +++ b/sphinx/texinputs/sphinxpackageboxes.sty @@ -12,9 +12,8 @@ \newbox\spx@tempboxa \newbox\spx@tempboxb -% WIP % Internal dimens, conditionals, and color parameters involved -% in \spx@boxes@fcolorbox@init which is to be set by callers +% in \spx@boxes@fcolorbox@setup which is to be set by callers \newif\ifspx@boxes@withshadow \newif\ifspx@boxes@insetshadow \newif\ifspx@boxes@withbackgroundcolor @@ -76,11 +75,11 @@ {\PackageWarningNoLine{sphinx}{% The package pict2e is required for rounded boxes.\MessageBreak It does not seem to be available on your system.\MessageBreak - The verbatimradius setting will thus be ignored}% + Options for setting radii will thus be ignored}% \AtEndDocument{\PackageWarningNoLine{sphinx}{% I issued a warning which may have gotten lost in the\MessageBreak gigantic console output: pict2e.sty was not found,\MessageBreak - and verbatimradius has been ignored}}% + and radii setting options have been ignored}}% \def\spx@boxes@fcolorbox@rounded{\spx@boxes@fcolorbox}% }% }% @@ -276,7 +275,8 @@ %%%%%%%% % \spx@boxes@fcolorbox@rounded % -% Various radii but only one borderwidth. No shadow +% Various radii but only one border-width parameter. +% Shadow too. % wrappers for pict2e usage if old % Better not to copy over 2020 pict2e definitions in case