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 bugfix from 0.5.

Browse Source
This commit is contained in:
Georg Brandl 2008-11-30 21:09:28 +01:00
commit 4634b296af
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sphinx/writers/latex.py
View File

@ -892,10 +892,16 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.append(r'\index{%s}' % scre.sub('!', self.encode(string))) self.body.append(r'\index{%s}' % scre.sub('!', self.encode(string)))
elif type == 'pair': elif type == 'pair':
parts = tuple(self.encode(x.strip()) for x in string.split(';', 1)) parts = tuple(self.encode(x.strip()) for x in string.split(';', 1))
self.body.append(r'\indexii{%s}{%s}' % parts) try:
self.body.append(r'\indexii{%s}{%s}' % parts)
except TypeError:
self.builder.warn('invalid pair index entry %r' % string)
elif type == 'triple': elif type == 'triple':
parts = tuple(self.encode(x.strip()) for x in string.split(';', 2)) parts = tuple(self.encode(x.strip()) for x in string.split(';', 2))
self.body.append(r'\indexiii{%s}{%s}{%s}' % parts) try:
self.body.append(r'\indexiii{%s}{%s}{%s}' % parts)
except TypeError:
self.builder.warn('invalid triple index entry %r' % string)
else: else:
self.builder.warn('unknown index entry type %s found' % type) self.builder.warn('unknown index entry type %s found' % type)
raise nodes.SkipNode raise nodes.SkipNode

8
tests/root/markup.txt
View File

@ -148,6 +148,14 @@ Index markup
single: entry single: entry
pair: entry; pair pair: entry; pair
triple: index; entry; triple triple: index; entry; triple
keyword: with
Invalid index markup...
.. index::
single:
pair:
keyword:
Ö... Some strange characters Ö... Some strange characters

4
tests/test_build.py
View File

@ -35,10 +35,14 @@ file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
HTML_WARNINGS = ENV_WARNINGS + """\ HTML_WARNINGS = ENV_WARNINGS + """\
WARNING: %(root)s/images.txt:: no matching candidate for image URI u'foo.*' WARNING: %(root)s/images.txt:: no matching candidate for image URI u'foo.*'
WARNING: %(root)s/markup.txt:: invalid index entry u''
WARNING: %(root)s/markup.txt:: invalid pair index entry u''
WARNING: %(root)s/markup.txt:: invalid pair index entry u'keyword; '
""" """
LATEX_WARNINGS = ENV_WARNINGS + """\ LATEX_WARNINGS = ENV_WARNINGS + """\
WARNING: None:: no matching candidate for image URI u'foo.*' WARNING: None:: no matching candidate for image URI u'foo.*'
WARNING: invalid pair index entry u''
""" """
HTML_XPATH = { HTML_XPATH = {