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

Merge branch '3.2.x' into 3.x

Browse Source
This commit is contained in:
Takeshi KOMIYA 2020-09-13 10:51:15 +09:00
commit 0b44e68d4f
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -44,6 +44,10 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #8188: C, add missing items to internal object types dictionary,
e.g., preventing intersphinx from resolving them.
Testing Testing
-------- --------

6
sphinx/domains/c.py
View File

@ -1792,7 +1792,7 @@ class Symbol:
if not declaration: if not declaration:
if Symbol.debug_lookup: if Symbol.debug_lookup:
Symbol.debug_print("no delcaration") Symbol.debug_print("no declaration")
Symbol.debug_indent -= 2 Symbol.debug_indent -= 2
# good, just a scope creation # good, just a scope creation
# TODO: what if we have more than one symbol? # TODO: what if we have more than one symbol?
@ -3607,6 +3607,10 @@ class CDomain(Domain):
'macro': ObjType(_('macro'), 'macro'), 'macro': ObjType(_('macro'), 'macro'),
'type': ObjType(_('type'), 'type'), 'type': ObjType(_('type'), 'type'),
'var': ObjType(_('variable'), 'data'), 'var': ObjType(_('variable'), 'data'),
'enum': ObjType(_('enum'), 'enum'),
'enumerator': ObjType(_('enumerator'), 'enumerator'),
'struct': ObjType(_('struct'), 'struct'),
'union': ObjType(_('union'), 'union'),
} }
directives = { directives = {

2
sphinx/domains/cpp.py
View File

@ -4292,7 +4292,7 @@ class Symbol:
if not declaration: if not declaration:
if Symbol.debug_lookup: if Symbol.debug_lookup:
Symbol.debug_print("no delcaration") Symbol.debug_print("no declaration")
Symbol.debug_indent -= 2 Symbol.debug_indent -= 2
# good, just a scope creation # good, just a scope creation
# TODO: what if we have more than one symbol? # TODO: what if we have more than one symbol?

8
tests/test_build_html.py
View File

@ -10,8 +10,10 @@
import os import os
import re import re
from distutils.version import LooseVersion
from itertools import cycle, chain from itertools import cycle, chain
import pygments
import pytest import pytest
from html5lib import HTMLParser from html5lib import HTMLParser
@ -1591,4 +1593,8 @@ def test_html_codeblock_linenos_style_inline(app):
app.build() app.build()
content = (app.outdir / 'index.html').read_text() content = (app.outdir / 'index.html').read_text()
assert '<span class="lineno">1 </span>' in content pygments_version = tuple(LooseVersion(pygments.__version__).version)
if pygments_version > (2, 7):
assert '<span class="linenos">1</span>' in content
else:
assert '<span class="lineno">1 </span>' in content