mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Make genindex support all kinds of letters, not only Latin ones
Without this i.e. all names starting with a Cyrillic letter are moved into a Symbols section rather than being split into sections by letter.
This commit is contained in:
parent
c8bb907a41
commit
046abd0577
@ -11,7 +11,6 @@
|
||||
import re
|
||||
import bisect
|
||||
import unicodedata
|
||||
import string
|
||||
from itertools import groupby
|
||||
|
||||
from six import text_type
|
||||
@ -114,13 +113,13 @@ class IndexEntries(EnvironmentManager):
|
||||
|
||||
# sort the index entries; put all symbols at the front, even those
|
||||
# following the letters in ASCII, this is where the chr(127) comes from
|
||||
def keyfunc(entry, lcletters=string.ascii_lowercase + '_'):
|
||||
def keyfunc(entry):
|
||||
key, (void, void, category_key) = entry
|
||||
if category_key:
|
||||
# using specified category key to sort
|
||||
key = category_key
|
||||
lckey = unicodedata.normalize('NFD', key.lower())
|
||||
if lckey[0:1] in lcletters:
|
||||
if lckey[0:1].isalpha() or lckey.startswith('_'):
|
||||
lckey = chr(127) + lckey
|
||||
# ensure a determinstic order *within* letters by also sorting on
|
||||
# the entry itself
|
||||
@ -158,14 +157,14 @@ class IndexEntries(EnvironmentManager):
|
||||
i += 1
|
||||
|
||||
# group the entries by letter
|
||||
def keyfunc2(item, letters=string.ascii_uppercase + '_'):
|
||||
def keyfunc2(item):
|
||||
# hack: mutating the subitems dicts to a list in the keyfunc
|
||||
k, v = item
|
||||
v[1] = sorted((si, se) for (si, (se, void, void)) in iteritems(v[1]))
|
||||
if v[2] is None:
|
||||
# now calculate the key
|
||||
letter = unicodedata.normalize('NFD', k[0])[0].upper()
|
||||
if letter in letters:
|
||||
if letter.isalpha() or letter == '_':
|
||||
return letter
|
||||
else:
|
||||
# get all other symbols under one heading
|
||||
|
Loading…
Reference in New Issue
Block a user