From 23438dd97f93b86115cc4196c88d12e5168acbd5 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 3 May 2013 18:12:21 +0100 Subject: Read numbering from document.xml --- lib/document-xml-reader.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/document-xml-reader.js') diff --git a/lib/document-xml-reader.js b/lib/document-xml-reader.js index 6f75745..b5e379c 100644 --- a/lib/document-xml-reader.js +++ b/lib/document-xml-reader.js @@ -9,7 +9,7 @@ var Result = require("./results").Result; var warning = require("./results").warning; -function DocumentXmlReader(relationships, contentTypes, docxFile) { +function DocumentXmlReader(relationships, contentTypes, docxFile, numbering) { function convertXmlToDocument(documentXml) { var body = documentXml.root.first("w:body"); @@ -46,7 +46,6 @@ function DocumentXmlReader(relationships, contentTypes, docxFile) { return readXmlElements(element.children) .map(function(children) { var properties = _.find(children, isParagraphProperties); - return new documents.Paragraph( children.filter(negate(isParagraphProperties)), properties @@ -64,9 +63,10 @@ function DocumentXmlReader(relationships, contentTypes, docxFile) { } var numberingPropertiesElement = element.first("w:numPr"); if (numberingPropertiesElement) { - properties.numbering = { - level: numberingPropertiesElement.first("w:ilvl").attributes["w:val"] - }; + var levelElement = numberingPropertiesElement.first("w:ilvl"); + var level = levelElement.attributes["w:val"]; + var numId = numberingPropertiesElement.first("w:numId").attributes["w:val"]; + properties.numbering = numbering.findLevel(numId, level); } return new Result(properties); -- cgit v1.2.3