LaTeX: better workaround for a Pygments LaTeXFormatter issue (with Pygments up to 2.7.4) #8879
Conversation
| _LATEX_ADD_STYLES_FIXPYG = r''' | ||
| \makeatletter | ||
| % fix for Pygments <= 2.7.4 | ||
| \let\spx@original@fcolorbox\fcolorbox |
There was a problem hiding this comment.
This means \fcolorbox (from color/xcolor package) must exist when sphinxhighlight.sty is loaded by sphinx.sty. But this is the case as color/xcolor is loaded very early by sphinx.sty, before handling options. So we are safe here. (this is true also on 3.x even though sphinxhighlight.sty is loaded earlier, but I feel now latex changes must only go to master). One could add some \AtBeginDocument to be extra safe if some package modifies \fcolorbox but I feel this is unnecessary. Besides in future, this patch will not be used when people have updated their Pygments version.
| \makeatletter | ||
| % fix for Pygments <= 2.7.4 | ||
| \let\spx@original@fcolorbox\fcolorbox | ||
| \def\spx@fixpyg@fcolorbox{\fboxsep-\fboxrule\spx@original@fcolorbox} |
There was a problem hiding this comment.
we don't have to insert here a \string -\fboxrule in place of -\fboxrule as was done at Pygments 2.8.1 to work-around a minted (latex package using Pygments) compatibility issue
Fix #8874
Feature or Bugfix
Relates
The upstream Pygments issue is fixed in their master branch for next release (current is 2.7.4).
So this tests for Pygments version and applies the fix only if needed.
Previously the Sphinx fix corrected the line spacing issue (which is infrequent because one has to use a Pygments style which utilizes "border" for some tokens and a lexer which produces these token types; this is case for pygments style 'manni' in combination with the diff lexer, see pygments/pygments#1708), but in a way overwriting the style specification. This PR does it better in a way obeying the style, and it moves the fix to better location away from sphinx.sty.