diff --git a/songbook-makeindex.py b/songbook-makeindex.py index d5252469..8509aa61 100755 --- a/songbook-makeindex.py +++ b/songbook-makeindex.py @@ -14,7 +14,7 @@ import os.path import glob import re from optparse import OptionParser -import title_sort +import sortindex import locale # Pattern set to ignore latex command in title prefix @@ -61,7 +61,7 @@ class index: def idxBlockToStr(self, letter, entries): str = '\\begin{idxblock}{'+letter+'}'+'\n' - for key in sorted(entries.keys(), key=title_sort.sortkey): + for key in sorted(entries.keys(), key=sortindex.sortkey): str += self.entryToStr(key, entries[key]) str += '\\end{idxblock}'+'\n' return str diff --git a/songbook.py b/songbook.py index f4a09cf6..1e694762 100755 --- a/songbook.py +++ b/songbook.py @@ -8,7 +8,7 @@ import glob import re import json import locale -import title_sort +import sortindex def matchRegexp(reg, iterable): return [ m.group(1) for m in (reg.match(l) for l in iterable) if m ] @@ -97,7 +97,7 @@ def makeTexFile(sb, output): if songs == "all": songs = map(lambda x: x[6:], glob.glob('songs/*/*.sg')) - songs.sort(key=title_sort.sortkey) + songs.sort(key=sortindex.sortkey) if len(songs) > 0: out.write(formatDefinition('songslist', songslist(songs))) out.write('\\makeatother\n') diff --git a/title_sort.py b/sortindex.py similarity index 100% rename from title_sort.py rename to sortindex.py