Merge bugfix from 0.5.

sphinx/writers/latex.py

@@ -892,10 +892,16 @@ class LaTeXTranslator(nodes.NodeVisitor):
                 self.body.append(r'\index{%s}' % scre.sub('!', self.encode(string)))
             elif type == 'pair':
                 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':
                 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:
                 self.builder.warn('unknown index entry type %s found' % type)
         raise nodes.SkipNode

tests/root/markup.txt

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

tests/test_build.py

@@ -35,10 +35,14 @@ file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
 
 HTML_WARNINGS = ENV_WARNINGS + """\
 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 + """\
 WARNING: None:: no matching candidate for image URI u'foo.*'
+WARNING: invalid pair index entry u''
 """
 
 HTML_XPATH = {