Remove runStyleMap in favour of general styleMap

1 files changed, 18 insertions, 11 deletions

diff --git a/lib/document-to-html.js b/lib/document-to-html.js
index 896053f..930e869 100644
--- a/lib/document-to-html.js
+++ b/lib/document-to-html.js
@@ -13,7 +13,6 @@ function DocumentConverter(options) {
     var defaultParagraphStyle = options.defaultParagraphStyle || htmlPaths.topLevelElement("p");
     
     var styleMap = options.styleMap || [];
-    var runStyleMap = options.runStyleMap || {};
     
     function convertToHtml(document) {
         var messages = [];
@@ -47,24 +46,24 @@ function DocumentConverter(options) {
     }
     
     function styleForParagraph(element, messages) {
-        for (var i = 0; i < styleMap.length; i++) {
-            if (styleMap[i].from(element)) {
-                return styleMap[i].to;
-            }
-        }
+        var style = findStyle(element);
         
-        if (element.styleName) {
-            messages.push(results.warning("Unrecognised paragraph style: " + element.styleName));
+        if (style) {
+            return style.to;
+        } else {
+            if (element.styleName) {
+                messages.push(results.warning("Unrecognised paragraph style: " + element.styleName));
+            }
+            return defaultParagraphStyle;
         }
-        return defaultParagraphStyle;
     }
     
     function convertRun(run, html, messages, callback) {
         var runHtml = new HtmlGenerator();
         if (run.styleName) {
-            var style = runStyleMap[run.styleName];
+            var style = findStyle(run);
             if (style) {
-                runHtml.satisfyPath(style);
+                runHtml.satisfyPath(style.to);
             } else {
                 messages.push(results.warning("Unrecognised run style: " + run.styleName));
             }
@@ -86,6 +85,14 @@ function DocumentConverter(options) {
         });
     }
     
+    function findStyle(element) {
+        for (var i = 0; i < styleMap.length; i++) {
+            if (styleMap[i].from(element)) {
+                return styleMap[i];
+            }
+        }
+    }
+    
     function defaultConvertImage(element, html, messages, callback) {
         element.read("base64").then(function(imageBuffer) {
             var src = "data:" + element.contentType + ";base64," + imageBuffer;