diff options
| author | Michael Williamson <mike@zwobble.org> | 2014-06-08 22:10:01 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2014-06-08 22:10:01 +0100 |
| commit | 2c66c1e16ef035017d68b0023d02a1507a2c43cd (patch) | |
| tree | 9a25c8cda1a1ad07d2f47d7a7e46ea2b005c5555 /mammoth | |
| parent | a7631d5d73d563967afcc529b35bf10f87d29035 (diff) | |
Use style_name when converting paragraphs
Diffstat (limited to 'mammoth')
| -rw-r--r-- | mammoth/conversion.py | 3 | ||||
| -rw-r--r-- | mammoth/documents.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mammoth/conversion.py b/mammoth/conversion.py index 2d3b043..6c13225 100644 --- a/mammoth/conversion.py +++ b/mammoth/conversion.py @@ -116,6 +116,9 @@ def _document_matcher_matches(matcher, element, element_type): matcher.style_id is None or matcher.style_id == element.style_id ) and ( + matcher.style_name is None or + matcher.style_name == element.style_name + ) and ( element_type != "paragraph" or matcher.numbering is None or matcher.numbering == element.numbering diff --git a/mammoth/documents.py b/mammoth/documents.py index b8da897..4438b06 100644 --- a/mammoth/documents.py +++ b/mammoth/documents.py @@ -2,7 +2,7 @@ import dodge Document = dodge.data_class("Document", ["children"]) -Paragraph = dodge.data_class("Paragraph", ["children", "style_id", "numbering"]) +Paragraph = dodge.data_class("Paragraph", ["children", "style_id", "style_name", "numbering"]) Run = dodge.data_class("Run", ["children", "style_id", "is_bold", "is_italic"]) Text = dodge.data_class("Text", ["value"]) Hyperlink = dodge.data_class("Hyperlink", ["href", "children"]) @@ -20,8 +20,8 @@ class Image(object): document = Document -def paragraph(children, style_id=None, numbering=None): - return Paragraph(children, style_id, numbering) +def paragraph(children, style_id=None, style_name=None, numbering=None): + return Paragraph(children, style_id, style_name, numbering) def run(children, style_id=None, is_bold=None, is_italic=None): return Run(children, style_id, bool(is_bold), bool(is_italic)) |