diff --git a/CHANGES b/CHANGES index 4a2059d18..8b9602a40 100644 --- a/CHANGES +++ b/CHANGES @@ -61,6 +61,12 @@ Features added Bugs fixed ---------- +* #10594: HTML Theme: field term colons are doubled if using Docutils 0.18+ +* #10596: Build failure if Docutils version is 0.18 (not 0.18.1) due + to missing ``Node.findall()`` +* #10506: LaTeX: build error when using ``:cpp:stuff`` syntax highlighting in + figure caption + Testing -------- diff --git a/sphinx/builders/latex/__init__.py b/sphinx/builders/latex/__init__.py index 47aa59344..32f9d32ef 100644 --- a/sphinx/builders/latex/__init__.py +++ b/sphinx/builders/latex/__init__.py @@ -245,7 +245,7 @@ class LaTeXBuilder(Builder): with open(stylesheet, 'w', encoding="utf-8") as f: f.write('\\NeedsTeXFormat{LaTeX2e}[1995/12/01]\n') f.write('\\ProvidesPackage{sphinxhighlight}' - '[2016/05/29 stylesheet for highlighting with pygments]\n') + '[2022/06/30 stylesheet for highlighting with pygments]\n') f.write('% Its contents depend on pygments_style configuration variable.\n\n') f.write(highlighter.get_stylesheet()) diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py index a7e5e4940..b86c31f5e 100644 --- a/sphinx/highlighting.py +++ b/sphinx/highlighting.py @@ -40,9 +40,14 @@ escape_hl_chars = {ord('\\'): '\\PYGZbs{}', ord('}'): '\\PYGZcb{}'} # used if Pygments is available -# use textcomp quote to get a true single quote _LATEX_ADD_STYLES = r''' +% Sphinx additions +% use textcomp quote to get a true single quote \renewcommand\PYGZsq{\textquotesingle} +\makeatletter +% use \protected to allow \PYG in \caption +\protected\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+{\PYG@do{#2}}} +\makeatother ''' # fix extra space between lines when Pygments highlighting uses \fcolorbox # add a {..} to limit \fboxsep scope, and force \fcolorbox use correct value @@ -52,7 +57,7 @@ _LATEX_ADD_STYLES_FIXPYG = r''' % fix for Pygments <= 2.7.4 \let\spx@original@fcolorbox\fcolorbox \def\spx@fixpyg@fcolorbox{\fboxsep-\fboxrule\spx@original@fcolorbox} -\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+% +\protected\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+% {\let\fcolorbox\spx@fixpyg@fcolorbox\PYG@do{#2}}} \makeatother ''' diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t index d8f3fe746..47f802dc4 100644 --- a/sphinx/themes/basic/static/basic.css_t +++ b/sphinx/themes/basic/static/basic.css_t @@ -686,9 +686,11 @@ dl.field-list > dt { padding-right: 5px; } +{%- if docutils_version_info[:2] < (0, 18) %} dl.field-list > dt:after { content: ":"; } +{% endif %} dl.field-list > dd { padding-left: 0.5em; diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py index e1fd78096..b2944ec28 100644 --- a/sphinx/util/docutils.py +++ b/sphinx/util/docutils.py @@ -550,9 +550,9 @@ class SphinxTranslator(nodes.NodeVisitor): # Node.findall() is a new interface to traverse a doctree since docutils-0.18. -# This applies a patch docutils-0.17 or older to be available Node.findall() +# This applies a patch to docutils up to 0.18 inclusive to provide Node.findall() # method to use it from our codebase. -if docutils.__version_info__ < (0, 18): +if docutils.__version_info__ <= (0, 18): def findall(self, *args, **kwargs): return iter(self.traverse(*args, **kwargs))