summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-12-13 17:43:42 +0000
committerMichael Williamson <mike@zwobble.org>2013-12-13 17:43:42 +0000
commit49d046acf05be128d404a419ecde05091efa30c1 (patch)
treed94ea94a5c4d03e4f0e2a0af49d52c861a42f04e
parent52a0281824ebe97f4233066b73a1e9739b639d9d (diff)
Support parsing unordered list document matcher
-rw-r--r--mammoth/style_reader/document_matcher_reader.py8
-rw-r--r--tests/style_reader_tests.py8
2 files changed, 13 insertions, 3 deletions
diff --git a/mammoth/style_reader/document_matcher_reader.py b/mammoth/style_reader/document_matcher_reader.py
index 837da51..7fc8bcb 100644
--- a/mammoth/style_reader/document_matcher_reader.py
+++ b/mammoth/style_reader/document_matcher_reader.py
@@ -33,8 +33,8 @@ def _read_style_node(style_node):
def _read_list_node(list_node):
if list_node.children:
return documents.NumberingLevel(
- int(list_node.children[0].children[1].text),
- is_ordered=True,
+ int(list_node.children[0].children[3].text),
+ is_ordered=list_node.children[0].children[1].text == "ordered-list",
)
else:
return None
@@ -51,6 +51,8 @@ style_name = "." style_identifier
style_identifier = ~"[A-Z0-9]*"i
-list = ":ordered-list(" ~"[0-9]+" ")"
+list = ":" list_type "(" ~"[0-9]+" ")"
+
+list_type = "ordered-list" / "unordered-list"
""")
diff --git a/tests/style_reader_tests.py b/tests/style_reader_tests.py
index b1afdb7..971cfac 100644
--- a/tests/style_reader_tests.py
+++ b/tests/style_reader_tests.py
@@ -88,6 +88,14 @@ class ReadDocumentMatcherTests(object):
@istest
+ def reads_paragraph_unordered_list(self):
+ assert_equal(
+ document_matchers.paragraph(numbering=documents.NumberingLevel(2, is_ordered=False)),
+ read_document_matcher("p:unordered-list(2)")
+ )
+
+
+ @istest
def reads_plain_run(self):
assert_equal(
document_matchers.run(),