X-Git-Url: https://git.korewanetadesu.com/?p=python-collate.git;a=blobdiff_plain;f=collate%2F_abcollator.py;h=02cb733c79d889462a03e4680ece539e664cb696;hp=a6ec268d9bb6512bffd6b1d752088798fde6ea09;hb=2a37219e2d9c0fe58e78d987a21f6e37cfd33940;hpb=96cd5d3ad9dd1390c7739a6c3b9fa03ac3a2b4ff

diff --git a/collate/_abcollator.py b/collate/_abcollator.py
index a6ec268..02cb733 100644
--- a/collate/_abcollator.py
+++ b/collate/_abcollator.py
@@ -1,3 +1,5 @@
+import collate._strings
+
 class Collator(object):
     def cmp(self, string1, string2):
         """Return negative if a < b, zero if a == b, positive if a > b."""
@@ -10,5 +12,12 @@ class Collator(object):
         """
         return string.split()
 
-    def wordkeys(self, string):
-        return map(self.key, self.words)
+    def sortemes(self, string):
+        return collate._strings.alnumsplit(string)
+
+    def sortemekey(self, string, invalid=float('inf')):
+        words = []
+        for sorteme in self.sortemes(string):
+            num, alpha = collate._strings.numeric(sorteme, invalid)
+            words.append((num, self.key(alpha)))
+        return words