diff options
| author | Michael Williamson <mike@zwobble.org> | 2019-03-17 21:44:44 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2019-03-17 21:45:09 +0000 |
| commit | f2fd5ec08b2b87278f2929d7c15c9ed71fbac8d8 (patch) | |
| tree | dfe036e0e13aa68e2173702d27a17edca0df2643 /src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java | |
| parent | 4d078c3842a40d723f79a5896250ad522ebd083a (diff) | |
Follow w:numStyleLink in w:abstractNum
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java index 6b5372f..b25ffdd 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java @@ -14,7 +14,7 @@ public class NumberingXml { public static Numbering readNumberingXmlElement(XmlElement element, Styles styles) { Map<String, Numbering.AbstractNum> abstractNums = readAbstractNums(element.findChildren("w:abstractNum")); Map<String, Numbering.Num> nums = readNums(element.findChildren("w:num")); - return new Numbering(abstractNums, nums); + return new Numbering(abstractNums, nums, styles); } private static Map<String, Numbering.AbstractNum> readAbstractNums(XmlElementList children) { @@ -24,7 +24,11 @@ public class NumberingXml { private static Map.Entry<String, Numbering.AbstractNum> readAbstractNum(XmlElement element) { // TODO: in python-mammoth, we allow None here. Check whether that's actually possible or not String abstractNumId = element.getAttribute("w:abstractNumId"); - return entry(abstractNumId, new Numbering.AbstractNum(readAbstractNumLevels(element))); + Numbering.AbstractNum abstractNum = new Numbering.AbstractNum( + readAbstractNumLevels(element), + element.findChildOrEmpty("w:numStyleLink").getAttributeOrNone("w:val") + ); + return entry(abstractNumId, abstractNum); } private static Map<String, NumberingLevel> readAbstractNumLevels(XmlElement element) { |
