From 31072b124b9a922ea829ddc6987e2d4f680d85ae Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 13 Feb 2016 18:46:49 +0000
Subject: Add style property to Run

---
 src/main/java/org/zwobble/mammoth/documents/Run.java      | 9 ++++++++-
 src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java | 7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/zwobble/mammoth/documents/Run.java b/src/main/java/org/zwobble/mammoth/documents/Run.java
index 9a41730..45ab77c 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Run.java
+++ b/src/main/java/org/zwobble/mammoth/documents/Run.java
@@ -1,18 +1,25 @@
 package org.zwobble.mammoth.documents;
 
 import java.util.List;
+import java.util.Optional;
 
 public class Run implements DocumentElement, HasChildren {
     private final List<DocumentElement> children;
+    private final Optional<Style> style;
 
-    public Run(List<DocumentElement> children) {
+    public Run(Optional<Style> style, List<DocumentElement> children) {
         this.children = children;
+        this.style = style;
     }
 
     public List<DocumentElement> getChildren() {
         return children;
     }
 
+    public Optional<Style> getStyle() {
+        return style;
+    }
+
     @Override
     public <T> T accept(DocumentElementVisitor<T> visitor) {
         return visitor.visit(this);
diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
index a9e99f1..4c826de 100644
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
@@ -30,7 +30,7 @@ public class BodyXmlReader {
             case "w:t":
                 return success(new Text(element.innerText()));
             case "w:r":
-                return readElements(element.children()).map(Run::new);
+                return readRun(element);
             case "w:p":
                 return readParagraph(element);
 
@@ -43,6 +43,11 @@ public class BodyXmlReader {
         }
     }
 
+    private ReadResult readRun(XmlElement element) {
+        return readElements(element.children())
+            .map(children -> new Run(Optional.empty(), children));
+    }
+
     public ReadResult readElements(Iterable<XmlNode> nodes) {
         return ReadResult.concat(
             transform(
-- 
cgit v1.2.3