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 '1.5-release'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-11-23 14:45:05 +09:00
commit a413b857af
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/search/jssplitter.py
View File

@ -1,14 +1,14 @@
"""# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
"""
sphinx.search.jssplitter
~~~~~~~~~~~~~~~~~~~~~~~~
Provides Python compatible word splitter to JavaScript
DO NOT EDIT. This is generated by utils/jssplitter_generator.py
:copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
DO NOT EDIT. This is generated by utils/jssplitter_generator.py
"""
splitter_code = """

2
sphinx/transforms/__init__.py
View File

@ -135,7 +135,7 @@ class CitationReferences(Transform):
# type: () -> None
for citnode in self.document.traverse(nodes.citation_reference):
cittext = citnode.astext()
refnode = addnodes.pending_xref(cittext, reftype='citation',
refnode = addnodes.pending_xref(cittext, refdomain='std', reftype='citation',
reftarget=cittext, refwarn=True,
ids=citnode["ids"])
refnode.source = citnode.source or citnode.parent.source

1
tests/test_ext_inheritance_diagram.py
View File

@ -9,6 +9,7 @@
:license: BSD, see LICENSE for details.
"""
import re
import sys
from util import with_app, rootdir, raises
from test_ext_graphviz import skip_if_graphviz_not_found

8
utils/jssplitter_generator.py
View File

@ -113,17 +113,17 @@ console.log(' ... ok\\n')
''' % js_src
python_src = '''
"""# -*- coding: utf-8 -*-
python_src = '''# -*- coding: utf-8 -*-
"""
sphinx.search.jssplitter
~~~~~~~~~~~~~~~~~~~~~~~~
Provides Python compatible word splitter to JavaScript
DO NOT EDIT. This is generated by utils/jssplitter_generator.py
:copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
DO NOT EDIT. This is generated by utils/jssplitter_generator.py
"""
splitter_code = """