aboutsummaryrefslogtreecommitdiff
path: root/mammoth/options.py
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2015-08-15 18:11:46 +0100
committerMichael Williamson <mike@zwobble.org>2015-08-15 18:11:46 +0100
commit2c9955f0590d93968b4959e3622d01610e398700 (patch)
tree886f42a3c647d8f0716a871685e925b95bd2bc6f /mammoth/options.py
parent724f9f01d83865ae586e7a8f65545e1a11d2cdae (diff)
Continue with warning style mapping cannot be parsed
Diffstat (limited to 'mammoth/options.py')
-rw-r--r--mammoth/options.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/mammoth/options.py b/mammoth/options.py
index 9d09146..1909b86 100644
--- a/mammoth/options.py
+++ b/mammoth/options.py
@@ -1,19 +1,20 @@
-from . import style_reader, lists
+from . import style_reader, lists, results
def read_options(options):
- custom_style_map = _read_style_map(options.get("style_map") or "")
+ custom_style_map_result = _read_style_map(options.get("style_map") or "")
include_default_style_map = options.get("include_default_style_map", True)
options["ignore_empty_paragraphs"] = options.get("ignore_empty_paragraphs", True)
- options["style_map"] = custom_style_map + \
+ options["style_map"] = custom_style_map_result.value + \
(_default_style_map if include_default_style_map else [])
- return options
+ return custom_style_map_result.map(lambda _: options)
def _read_style_map(style_text):
lines = filter(None, map(_get_line, style_text.split("\n")))
- return lists.map(style_reader.read_style, lines)
+ return results.combine(lists.map(style_reader.read_style, lines)) \
+ .map(lambda style_mappings: filter(None, style_mappings))
def _get_line(line):
@@ -24,7 +25,7 @@ def _get_line(line):
return line
-_default_style_map = _read_style_map("""
+_default_style_map_result = _read_style_map("""
p[style-name='Normal'] => p:fresh
p.Heading1 => h1:fresh
@@ -68,3 +69,6 @@ p:ordered-list(5) => ul|ol > li > ul|ol > li > ul|ol > li > ul|ol > li > ol > li
r[style-name='Hyperlink'] =>
""")
+
+assert not _default_style_map_result.messages
+_default_style_map = _default_style_map_result.value