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 'stable' into 1.7-release

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-01-20 02:22:35 +09:00
commit 8b8c3d1736
6 changed files with 496 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -193,7 +193,8 @@ Bugs fixed
---------- ----------
* #1922: html search: Upper characters problem in French * #1922: html search: Upper characters problem in French
* #4412: Updated jQuery version from 3.1.0 to 3.2.1
* #4438: math: math with labels with whitespace cause html error
Testing Testing
-------- --------

19
sphinx/ext/mathbase.py
View File

@ -10,6 +10,7 @@
""" """
from docutils import nodes, utils from docutils import nodes, utils
from docutils.nodes import make_id
from docutils.parsers.rst import Directive, directives from docutils.parsers.rst import Directive, directives
from sphinx.config import string_classes from sphinx.config import string_classes
@ -55,7 +56,8 @@ class MathDomain(Domain):
label = 'mathematics' label = 'mathematics'
initial_data = { initial_data = {
'objects': {}, # labelid -> (docname, eqno) 'nameids': {}, # label -> equation ID
'objects': {}, # equation ID -> (docname, eqno)
} # type: Dict[unicode, Dict[unicode, Tuple[unicode, int]]] } # type: Dict[unicode, Dict[unicode, Tuple[unicode, int]]]
dangling_warnings = { dangling_warnings = {
'eq': 'equation not found: %(target)s', 'eq': 'equation not found: %(target)s',
@ -63,9 +65,9 @@ class MathDomain(Domain):
def clear_doc(self, docname): def clear_doc(self, docname):
# type: (unicode) -> None # type: (unicode) -> None
for labelid, (doc, eqno) in list(self.data['objects'].items()): for equation_id, (doc, eqno) in list(self.data['objects'].items()):
if doc == docname: if doc == docname:
del self.data['objects'][labelid] del self.data['objects'][equation_id]
def merge_domaindata(self, docnames, otherdata): def merge_domaindata(self, docnames, otherdata):
# type: (Iterable[unicode], Dict) -> None # type: (Iterable[unicode], Dict) -> None
@ -84,10 +86,10 @@ class MathDomain(Domain):
newnode['target'] = target newnode['target'] = target
return newnode return newnode
else: else:
node_id = make_id('equation-%s' % target)
if env.config.math_numfig and env.config.numfig: if env.config.math_numfig and env.config.numfig:
if docname in env.toc_fignumbers: if docname in env.toc_fignumbers:
id = 'equation-' + target number = env.toc_fignumbers[docname]['displaymath'].get(node_id, ())
number = env.toc_fignumbers[docname]['displaymath'].get(id, ())
number = '.'.join(map(str, number)) number = '.'.join(map(str, number))
else: else:
number = '' number = ''
@ -98,8 +100,8 @@ class MathDomain(Domain):
logger.warning('Invalid math_eqref_format: %r', exc, logger.warning('Invalid math_eqref_format: %r', exc,
location=node) location=node)
title = nodes.Text("(%d)" % number) title = nodes.Text("(%d)" % number)
return make_refnode(builder, fromdocname, docname, title = nodes.Text("(%d)" % number)
"equation-" + target, title) return make_refnode(builder, fromdocname, docname, node_id, title)
else: else:
return None return None
@ -260,7 +262,8 @@ class MathDirective(Directive):
node['number'] = eqno node['number'] = eqno
# add target node # add target node
target = nodes.target('', '', ids=['equation-' + node['label']]) node_id = make_id('equation-%s' % node['label'])
target = nodes.target('', '', ids=[node_id])
self.state.document.note_explicit_target(target) self.state.document.note_explicit_target(target)
ret.insert(0, target) ret.insert(0, target)
except UserWarning as exc: except UserWarning as exc:

771
sphinx/themes/basic/static/jquery-3.1.0.js → sphinx/themes/basic/static/jquery-3.2.1.js vendored
View File

File diff suppressed because it is too large Load Diff

8
sphinx/themes/basic/static/jquery.js vendored
View File

File diff suppressed because one or more lines are too long

6
tests/test_ext_math.py
View File

@ -40,9 +40,9 @@ def test_jsmath(app, status, warning):
assert (u'<span class="eqno">(1)<a class="headerlink" href="#equation-foo" ' assert (u'<span class="eqno">(1)<a class="headerlink" href="#equation-foo" '
u'title="Permalink to this equation">\xb6</a></span>' u'title="Permalink to this equation">\xb6</a></span>'
u'<div class="math notranslate" id="equation-foo">\ne^{i\\pi} = 1</div>' in content) u'<div class="math notranslate" id="equation-foo">\ne^{i\\pi} = 1</div>' in content)
assert (u'<span class="eqno">(2)<a class="headerlink" href="#equation-math:0" ' assert (u'<span class="eqno">(2)<a class="headerlink" href="#equation-math-0" '
u'title="Permalink to this equation">\xb6</a></span>' u'title="Permalink to this equation">\xb6</a></span>'
u'<div class="math notranslate" id="equation-math:0">\n' u'<div class="math notranslate" id="equation-math-0">\n'
u'e^{ix} = \\cos x + i\\sin x</div>' in content) u'e^{ix} = \\cos x + i\\sin x</div>' in content)
assert '<div class="math notranslate">\nn \\in \\mathbb N</div>' in content assert '<div class="math notranslate">\nn \\in \\mathbb N</div>' in content
assert '<div class="math notranslate">\na + 1 &lt; b</div>' in content assert '<div class="math notranslate">\na + 1 &lt; b</div>' in content
@ -102,7 +102,7 @@ def test_math_number_all_mathjax(app, status, warning):
app.builder.build_all() app.builder.build_all()
content = (app.outdir / 'index.html').text() content = (app.outdir / 'index.html').text()
html = (r'<div class="math notranslate" id="equation-index:0">\s*' html = (r'<div class="math notranslate" id="equation-index-0">\s*'
r'<span class="eqno">\(1\)<a .*>\xb6</a></span>\\\[a\^2\+b\^2=c\^2\\\]</div>') r'<span class="eqno">\(1\)<a .*>\xb6</a></span>\\\[a\^2\+b\^2=c\^2\\\]</div>')
assert re.search(html, content, re.S) assert re.search(html, content, re.S)

2
tests/test_theming.py
View File

@ -71,7 +71,7 @@ def test_js_source(app, status, warning):
app.builder.build(['contents']) app.builder.build(['contents'])
v = '3.1.0' v = '3.2.1'
msg = 'jquery.js version does not match to {v}'.format(v=v) msg = 'jquery.js version does not match to {v}'.format(v=v)
jquery_min = (app.outdir / '_static' / 'jquery.js').text() jquery_min = (app.outdir / '_static' / 'jquery.js').text()
assert 'jQuery v{v}'.format(v=v) in jquery_min, msg assert 'jQuery v{v}'.format(v=v) in jquery_min, msg