From 0695263132193745d7f543fb1a20b63dbfe00075 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 8 Apr 2013 20:54:09 +0100
Subject: Rename styles module to htmlPaths

---
 lib/document-to-html.js | 12 ++++++------
 lib/html-paths.js       | 29 +++++++++++++++++++++++++++++
 lib/index.js            | 10 +++++-----
 lib/style-reader.js     |  6 +++---
 lib/styles.js           | 28 ----------------------------
 5 files changed, 43 insertions(+), 42 deletions(-)
 create mode 100644 lib/html-paths.js
 delete mode 100644 lib/styles.js

(limited to 'lib')

diff --git a/lib/document-to-html.js b/lib/document-to-html.js
index 1fce576..8fe2f0f 100644
--- a/lib/document-to-html.js
+++ b/lib/document-to-html.js
@@ -1,6 +1,6 @@
 var q = require("q");
 
-var styles = require("./styles");
+var htmlPaths = require("./html-paths");
 var HtmlGenerator = require("./html-generator").HtmlGenerator;
 
 exports.DocumentConverter = DocumentConverter;
@@ -8,7 +8,7 @@ exports.DocumentConverter = DocumentConverter;
 
 function DocumentConverter(options) {
     options = options || {};
-    var defaultParagraphStyle = options.defaultParagraphStyle || styles.topLevelElement("p");
+    var defaultParagraphStyle = options.defaultParagraphStyle || htmlPaths.topLevelElement("p");
     
     var paragraphStyleMap = options.paragraphStyleMap || {};
     var runStyleMap = options.runStyleMap || {};
@@ -58,10 +58,10 @@ function DocumentConverter(options) {
             }
         }
         if (run.isBold) {
-            runHtml.push(styles.element("strong"));
+            runHtml.push(htmlPaths.element("strong"));
         }
         if (run.isItalic) {
-            runHtml.push(styles.element("em"));
+            runHtml.push(htmlPaths.element("em"));
         }
         return convertElements(run.children, runHtml)
             .then(function() {
@@ -80,7 +80,7 @@ function DocumentConverter(options) {
             html.text(element.value);
         },
         "hyperlink": function(element, html) {
-            html.push(styles.element("a", {href: element.href}));
+            html.push(htmlPaths.element("a", {href: element.href}));
             return convertElements(element.children, html).then(function() {
                 html.pop();
             });
@@ -93,7 +93,7 @@ function DocumentConverter(options) {
                 if (element.altText) {
                     attributes.alt = element.altText;
                 }
-                html.selfClosing(styles.element("img", attributes));
+                html.selfClosing(htmlPaths.element("img", attributes));
             });
         }
     };
diff --git a/lib/html-paths.js b/lib/html-paths.js
new file mode 100644
index 0000000..1d3b1f4
--- /dev/null
+++ b/lib/html-paths.js
@@ -0,0 +1,29 @@
+var _ = require("underscore");
+
+exports.topLevelElement = topLevelElement;
+exports.elements = elements;
+exports.element = element;
+
+function topLevelElement(tagName, attributes) {
+    return elements([element(tagName, attributes, {fresh: true})]);
+}
+
+function elements(elementStyles) {
+    return elementStyles.map(function(elementStyle) {
+        if (_.isString(elementStyle)) {
+            return element(elementStyle);
+        } else {
+            return elementStyle;
+        }
+    });
+}
+
+function element(tagName, attributes, options) {
+    options = options || {};
+    return {
+        tagName: tagName,
+        attributes: attributes || {},
+        fresh: options.fresh
+    };
+}
+
diff --git a/lib/index.js b/lib/index.js
index 96ba751..778aad6 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,14 +1,14 @@
 var docxReader = require("./docx-reader");
 var DocumentConverter = require("./document-to-html").DocumentConverter;
-var styles = require("./styles");
+var htmlPaths = require("./html-paths");
 
 exports.Converter = Converter;
 exports.standardOptions = {
     paragraphStyleMap: {
-        "Heading1": styles.topLevelElement("h1"),
-        "Heading2": styles.topLevelElement("h2"),
-        "Heading3": styles.topLevelElement("h3"),
-        "Heading4": styles.topLevelElement("h4")
+        "Heading1": htmlPaths.topLevelElement("h1"),
+        "Heading2": htmlPaths.topLevelElement("h2"),
+        "Heading3": htmlPaths.topLevelElement("h3"),
+        "Heading4": htmlPaths.topLevelElement("h4")
     }
 };
 
diff --git a/lib/style-reader.js b/lib/style-reader.js
index 9e23abd..01331a6 100644
--- a/lib/style-reader.js
+++ b/lib/style-reader.js
@@ -1,7 +1,7 @@
 var lop = require("lop");
 var RegexTokeniser = lop.RegexTokeniser;
 
-var styles = require("./styles");
+var htmlPaths = require("./html-paths");
 
 exports.read = read;
 
@@ -41,7 +41,7 @@ function read(string) {
         if (fresh) {
             options["fresh"] = true;
         }
-        return styles.element(tagName, attributes, options);
+        return htmlPaths.element(tagName, attributes, options);
     });
     
     var styleRule = lop.rules.then(
@@ -53,7 +53,7 @@ function read(string) {
                 whitespaceRule
             )
         ),
-        styles.elements
+        htmlPaths.elements
     );
     
     var tokens = tokenise(string);
diff --git a/lib/styles.js b/lib/styles.js
deleted file mode 100644
index 737bdcb..0000000
--- a/lib/styles.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var _ = require("underscore");
-
-exports.topLevelElement = topLevelElement;
-exports.elements = elements;
-exports.element = element;
-
-function topLevelElement(tagName, attributes) {
-    return elements([element(tagName, attributes, {fresh: true})]);
-}
-
-function elements(elementStyles) {
-    return elementStyles.map(function(elementStyle) {
-        if (_.isString(elementStyle)) {
-            return element(elementStyle);
-        } else {
-            return elementStyle;
-        }
-    });
-}
-
-function element(tagName, attributes, options) {
-    options = options || {};
-    return {
-        tagName: tagName,
-        attributes: attributes || {},
-        fresh: options.fresh
-    };
-}
-- 
cgit v1.2.3