aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-04-27 17:24:36 +0100
committerMichael Williamson <mike@zwobble.org>2013-04-27 17:24:36 +0100
commita47c069ab224071866288769d8e2af46e29572f6 (patch)
treefda5a11c61345244222249f73b0e812099e908da
parentedc871d3aa33bded7ee766a7374fcdbfe93a01bd (diff)
Add support for anchored images
-rw-r--r--lib/document-xml-reader.js43
-rw-r--r--tests/document-xml-reader.tests.js36
2 files changed, 59 insertions, 20 deletions
diff --git a/lib/document-xml-reader.js b/lib/document-xml-reader.js
index 1724b5b..caf0ac6 100644
--- a/lib/document-xml-reader.js
+++ b/lib/document-xml-reader.js
@@ -105,31 +105,34 @@ function DocumentXmlReader(relationships, docxFile) {
"w:drawing": function(element) {
return readXmlElements(element.children);
},
- "wp:inline": function(element) {
- var blips = element
- .getElementsByTagName("a:graphic")
- .getElementsByTagName("a:graphicData")
- .getElementsByTagName("pic:pic")
- .getElementsByTagName("pic:blipFill")
- .getElementsByTagName("a:blip");
-
- var results = blips.map(function(blip) {
- var relationshipId = blip.attributes["r:embed"];
- var imagePath = relationships[relationshipId].target;
- var readImage = docxFile.read.bind(docxFile, path.join("word", imagePath));
- var altText = element.first("wp:docPr").attributes.descr;
-
- var image = documents.Image(readImage, altText)
- return new Result(image);
- });
-
- return Result.combine(results);
- }
+ "wp:inline": readDrawingElement,
+ "wp:anchor": readDrawingElement
};
return {
convertXmlToDocument: convertXmlToDocument,
readXmlElement: readXmlElement
};
+
+ function readDrawingElement(element) {
+ var blips = element
+ .getElementsByTagName("a:graphic")
+ .getElementsByTagName("a:graphicData")
+ .getElementsByTagName("pic:pic")
+ .getElementsByTagName("pic:blipFill")
+ .getElementsByTagName("a:blip");
+
+ var results = blips.map(function(blip) {
+ var relationshipId = blip.attributes["r:embed"];
+ var imagePath = relationships[relationshipId].target;
+ var readImage = docxFile.read.bind(docxFile, path.join("word", imagePath));
+ var altText = element.first("wp:docPr").attributes.descr;
+
+ var image = documents.Image(readImage, altText)
+ return new Result(image);
+ });
+
+ return Result.combine(results);
+ }
}
var ignoreElements = {
diff --git a/tests/document-xml-reader.tests.js b/tests/document-xml-reader.tests.js
index 8edcf72..de4fced 100644
--- a/tests/document-xml-reader.tests.js
+++ b/tests/document-xml-reader.tests.js
@@ -135,6 +135,42 @@ describe("readXmlElement: ", function() {
});
});
+ test("can read anchored pictures", function() {
+ var drawing = new XmlElement("w:drawing", {}, [
+ new XmlElement("wp:anchor", {}, [
+ new XmlElement("wp:docPr", {descr: "It's a hat"}),
+ new XmlElement("a:graphic", {}, [
+ new XmlElement("a:graphicData", {}, [
+ new XmlElement("pic:pic", {}, [
+ new XmlElement("pic:blipFill", {}, [
+ new XmlElement("a:blip", {"r:embed": "rId5"})
+ ])
+ ])
+ ])
+ ])
+ ])
+ ]);
+
+ var imageBuffer = new Buffer("Not an image at all!");
+ var reader = new DocumentXmlReader(
+ {
+ "rId5": {target: "media/hat.png"}
+ },
+ createFakeDocxFile({
+ "word/media/hat.png": imageBuffer
+ })
+ );
+ var result = reader.readXmlElement(drawing);
+ assert.deepEqual(result.messages, []);
+ var element = single(result.value);
+ assert.equal("image", element.type);
+ assert.equal(element.altText, "It's a hat");
+ return element.read()
+ .then(function(readValue) {
+ assert.equal(readValue, imageBuffer)
+ });
+ });
+
test("no elements created if image cannot be found in w:drawing", function() {
var drawing = new XmlElement("w:drawing", {}, []);