aboutsummaryrefslogtreecommitdiff
path: root/mammoth
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2014-01-07 22:55:43 +0000
committerMichael Williamson <mike@zwobble.org>2014-01-07 22:55:43 +0000
commit86e37ffa1500a444b59d9ae951f4bfa0bff69caf (patch)
tree105df143bcb0323c7fb8b32c18c43ff83eeb7174 /mammoth
parent189b6180fc032c95e49023879fcf328795b45bd3 (diff)
Include default style map when using custom style map
Diffstat (limited to 'mammoth')
-rw-r--r--mammoth/options.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/mammoth/options.py b/mammoth/options.py
index 4e4d5f1..a2e32b7 100644
--- a/mammoth/options.py
+++ b/mammoth/options.py
@@ -2,12 +2,9 @@ from . import style_reader, lists
def read_options(options):
- if options.get("style_map") is None:
- style_map = _default_style_map
- else:
- style_map = _read_style_map(style_map)
+ custom_style_map = _read_style_map(options.get("style_map") or "")
- options["style_map"] = style_map
+ options["style_map"] = custom_style_map + _default_style_map
return options