From 4a35a848117c4fe646d36419096d099030878469 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 1 Dec 2013 13:28:57 +0000 Subject: Add style_name to Run --- mammoth/documents.py | 14 ++++++++++---- mammoth/docx/document_xml.py | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'mammoth') diff --git a/mammoth/documents.py b/mammoth/documents.py index 08e3bba..215df8e 100644 --- a/mammoth/documents.py +++ b/mammoth/documents.py @@ -1,11 +1,17 @@ import collections +Document = collections.namedtuple("Document", ["children"]) +Paragraph = collections.namedtuple("Paragraph", ["children", "style_name", "numbering"]) +Run = collections.namedtuple("Run", ["children", "style_name"]) +Text = collections.namedtuple("Text", ["value"]) + + +document = Document def paragraph(children, style_name=None, numbering=None): return Paragraph(children, style_name, numbering) +def run(children, style_name=None): + return Run(children, style_name) -Document = collections.namedtuple("Document", ["children"]) -Paragraph = collections.namedtuple("Paragraph", ["children", "style_name", "numbering"]) -Run = collections.namedtuple("Run", ["children"]) -Text = collections.namedtuple("Text", ["value"]) +text = Text diff --git a/mammoth/docx/document_xml.py b/mammoth/docx/document_xml.py index 425ba37..403f880 100644 --- a/mammoth/docx/document_xml.py +++ b/mammoth/docx/document_xml.py @@ -22,7 +22,7 @@ def _create_reader(numbering): @handler("w:r") def run(element): - return documents.Run(_read_xml_elements(element.children)) + return documents.run(_read_xml_elements(element.children)) @handler("w:p") -- cgit v1.2.3