Browse Source

Revert "try sorting based on locale preferences"

This reverts commit 551fcd3df5.
remotes/origin/cmake
Romain Goffe 13 years ago
parent
commit
78ac6f23ef
  1. 3
      songbook-makeindex.py
  2. 3
      songbook.py

3
songbook-makeindex.py

@ -13,7 +13,6 @@ import sys
import os.path
import glob
import re
import locale
from optparse import OptionParser
# Pattern set to ignore latex command in title prefix
@ -60,7 +59,7 @@ class index:
def idxBlockToStr(self, letter, entries):
str = '\\begin{idxblock}{'+letter+'}'+'\n'
for key in sorted(entries.keys(), cmp=locale.strcoll):
for key in sorted(entries.keys()):
str += self.entryToStr(key, entries[key])
str += '\\end{idxblock}'+'\n'
return str

3
songbook.py

@ -7,7 +7,6 @@ import os.path
import glob
import re
import json
import locale
def matchRegexp(reg, iterable):
return [ m.group(1) for m in (reg.match(l) for l in iterable) if m ]
@ -95,7 +94,7 @@ def makeTexFile(sb, output):
# output songslist
if songs == "all":
songs = map(lambda x: x[6:], glob.glob('songs/*/*.sg'))
songs = sorted(songs, cmp=locale.strcoll)
songs.sort()
if len(songs) > 0:
out.write(formatDefinition('songslist', songslist(songs)))
out.write('\\makeatother\n')

Loading…
Cancel
Save