Read numbering from parapgraph properties

4 files changed, 33 insertions, 13 deletions

diff --git a/src/main/java/org/zwobble/mammoth/Mammoth.java b/src/main/java/org/zwobble/mammoth/Mammoth.java
index e834b3b..05080cf 100644
--- a/src/main/java/org/zwobble/mammoth/Mammoth.java
+++ b/src/main/java/org/zwobble/mammoth/Mammoth.java
@@ -2,10 +2,7 @@ package org.zwobble.mammoth;
 
 import com.google.common.base.Joiner;
 import org.zwobble.mammoth.documents.*;
-import org.zwobble.mammoth.docx.BodyXmlReader;
-import org.zwobble.mammoth.docx.DocumentXmlReader;
-import org.zwobble.mammoth.docx.OfficeXml;
-import org.zwobble.mammoth.docx.Styles;
+import org.zwobble.mammoth.docx.*;
 import org.zwobble.mammoth.xml.XmlElement;
 
 import java.io.File;
@@ -22,7 +19,8 @@ public class Mammoth {
             XmlElement documentXml = OfficeXml.parseXml(zipFile.getInputStream(entry));
 
             Styles styles = Styles.EMPTY;
-            Document document = new DocumentXmlReader(new BodyXmlReader(styles)).readElement(documentXml);
+            Numbering numbering = Numbering.EMPTY;
+            Document document = new DocumentXmlReader(new BodyXmlReader(styles, numbering)).readElement(documentXml);
             return convertToHtml(document);
         } catch (IOException e) {
             throw new UnsupportedOperationException("Should return a result of failure");   
diff --git a/src/main/java/org/zwobble/mammoth/documents/NumberingLevel.java b/src/main/java/org/zwobble/mammoth/documents/NumberingLevel.java
index ca134b9..cdbb0c4 100644
--- a/src/main/java/org/zwobble/mammoth/documents/NumberingLevel.java
+++ b/src/main/java/org/zwobble/mammoth/documents/NumberingLevel.java
@@ -1,6 +1,10 @@
 package org.zwobble.mammoth.documents;
 
 public class NumberingLevel {
+    public static NumberingLevel ordered(String levelIndex) {
+        return new NumberingLevel(levelIndex, true);
+    }
+
     private final String levelIndex;
     private final boolean isOrdered;
 
diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
index 73bab7e..42cee65 100644
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
@@ -14,9 +14,11 @@ import static org.zwobble.mammoth.util.MammothLists.list;
 
 public class BodyXmlReader {
     private final Styles styles;
+    private final Numbering numbering;
 
-    public BodyXmlReader(Styles styles) {
+    public BodyXmlReader(Styles styles, Numbering numbering) {
         this.styles = styles;
+        this.numbering = numbering;
     }
 
     public List<DocumentElement> readElement(XmlElement element) {
@@ -46,16 +48,28 @@ public class BodyXmlReader {
     }
 
     private Paragraph readParagraph(XmlElement element) {
-        return new Paragraph(readParagraphStyle(element), readNumbering(element), readElements(element.children()));
+        XmlElementLike properties = element.findChildOrEmpty("w:pPr");
+        return new Paragraph(
+            readParagraphStyle(properties),
+            readNumbering(properties),
+            readElements(element.children()));
     }
 
-    private Optional<Style> readParagraphStyle(XmlElement paragraph) {
-        XmlElementLike properties = paragraph.findChildOrEmpty("w:pPr");
-        return properties.findChildOrEmpty("w:pStyle").getAttributeOrNone("w:val")
-            .map(styleId -> styles.findParagraphStyleById(styleId).orElse(new Style(styleId, Optional.empty())));
+    private Optional<Style> readParagraphStyle(XmlElementLike properties) {
+        return properties.findChildOrEmpty("w:pStyle")
+            .getAttributeOrNone("w:val")
+            .map(styleId -> styles.findParagraphStyleById(styleId)
+                .orElse(new Style(styleId, Optional.empty())));
     }
 
-    private Optional<NumberingLevel> readNumbering(XmlElement element) {
-        return Optional.empty();
+    private Optional<NumberingLevel> readNumbering(XmlElementLike properties) {
+        XmlElementLike numberingProperties = properties.findChildOrEmpty("w:numPr");
+        Optional<String> numId = numberingProperties.findChildOrEmpty("w:numId").getAttributeOrNone("w:val");
+        Optional<String> levelIndex = numberingProperties.findChildOrEmpty("w:ilvl").getAttributeOrNone("w:val");
+        if (numId.isPresent() && levelIndex.isPresent()) {
+            return numbering.findLevel(numId.get(), levelIndex.get());
+        } else {
+            return Optional.empty();
+        }
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/docx/Numbering.java b/src/main/java/org/zwobble/mammoth/docx/Numbering.java
index 43b3e56..2f381dc 100644
--- a/src/main/java/org/zwobble/mammoth/docx/Numbering.java
+++ b/src/main/java/org/zwobble/mammoth/docx/Numbering.java
@@ -5,7 +5,11 @@ import org.zwobble.mammoth.documents.NumberingLevel;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.zwobble.mammoth.util.MammothMaps.map;
+
 public class Numbering {
+    public static final Numbering EMPTY = new Numbering(map());
+
     private final Map<String, Map<String, NumberingLevel>> numbering;
 
     public Numbering(Map<String, Map<String, NumberingLevel>> numbering) {