1. Gregg Lind
  2. sphinx

Commits

Georg Brandl  committed b2cdc95 Merge

merge with 0.6

  • Participants
  • Parent commits 88ba0e4, 5d775f3
  • Branches default

Comments (0)

Files changed (2)

File sphinx/directives/other.py

View file
  • Ignore whitespace
     option_spec = {}
 
     indextypes = [
-        'single', 'pair', 'triple',
+        'single', 'pair', 'double', 'triple',
     ]
 
     def run(self):
                 for type in self.indextypes:
                     if entry.startswith(type+':'):
                         value = entry[len(type)+1:].strip()
+                        if type == 'double':
+                            type = 'pair'
                         ne.append((type, value, targetid, value))
                         break
                 # shorthand notation for single entries

File tests/root/markup.txt

View file
  • Ignore whitespace
 .. index::
    single: entry
    pair: entry; pair
+   double: entry; double
    triple: index; entry; triple
    keyword: with