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

Closes #853: Restore compatibility with docutils trunk.

Browse Source
This commit is contained in:
Georg Brandl 2012-01-29 11:20:12 +01:00
parent d16875f3e2
commit b15eb0c086
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -27,6 +27,8 @@ Release 1.1.3 (in development)
* #851: Recognize and warn about circular toctrees, instead of running * #851: Recognize and warn about circular toctrees, instead of running
into recursion errors. into recursion errors.
* #853: Restore compatibility with docutils trunk.
Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway! Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
====================================================================== ======================================================================

4
sphinx/util/nodes.py
View File

@ -179,8 +179,12 @@ def set_source_info(directive, node):
directive.state_machine.get_source_and_line(directive.lineno) directive.state_machine.get_source_and_line(directive.lineno)
def set_role_source_info(inliner, lineno, node): def set_role_source_info(inliner, lineno, node):
try:
node.source, node.line = \ node.source, node.line = \
inliner.reporter.locator(lineno) inliner.reporter.locator(lineno)
except AttributeError:
# docutils 0.9+
node.source, node.line = inliner.reporter.get_source_and_line(lineno)
# monkey-patch Node.__contains__ to get consistent "in" operator behavior # monkey-patch Node.__contains__ to get consistent "in" operator behavior
# across docutils versions # across docutils versions

2
sphinx/writers/html.py
View File

@ -65,6 +65,8 @@ class HTMLTranslator(BaseTranslator):
self.permalink_text = self.permalink_text and u'\u00B6' or '' self.permalink_text = self.permalink_text and u'\u00B6' or ''
self.permalink_text = self.encode(self.permalink_text) self.permalink_text = self.encode(self.permalink_text)
self.secnumber_suffix = builder.config.html_secnumber_suffix self.secnumber_suffix = builder.config.html_secnumber_suffix
self.param_separator = ''
self._table_row_index = 0
def visit_start_of_file(self, node): def visit_start_of_file(self, node):
# only occurs in the single-file builder # only occurs in the single-file builder