From 428313d1ea6b67642eac19b35af0ff3d69065414 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 7 Dec 2011 17:18:39 +0100 Subject: [PATCH] Fix the subitems formatter function to split only when the period is surrounded by non-white space and not another period --- src/calibre/utils/formatter_functions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 8f2833050f..30c0efc793 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -720,12 +720,12 @@ class BuiltinSubitems(BuiltinFormatterFunction): items = [v.strip() for v in val.split(',')] rv = set() for item in items: - component = item.split('.') + components = re.split(r'(?<=[^\.\s])\.(?=[^\.\s])', item, flags=re.U) try: if ei == 0: - rv.add('.'.join(component[si:])) + rv.add('.'.join(components[si:])) else: - rv.add('.'.join(component[si:ei])) + rv.add('.'.join(components[si:ei])) except: pass return ', '.join(sorted(rv, key=sort_key))