Move html-paths and document-matchers to styles module

11 files changed, 16 insertions, 16 deletions

diff --git a/lib/document-to-html.js b/lib/document-to-html.js
index 6094803..61797a1 100644
--- a/lib/document-to-html.js
+++ b/lib/document-to-html.js
@@ -2,7 +2,7 @@ var _ = require("underscore");
 
 var promises = require("./promises");
 var documents = require("./documents");
-var htmlPaths = require("./html-paths");
+var htmlPaths = require("./styles/html-paths");
 var results = require("./results");
 var images = require("./images");
 var Html = require("./html");
diff --git a/lib/html/ast.js b/lib/html/ast.js
index db9e690..0dd8120 100644
--- a/lib/html/ast.js
+++ b/lib/html/ast.js
@@ -1,4 +1,4 @@
-var htmlPaths = require("../html-paths");
+var htmlPaths = require("../styles/html-paths");
 
 
 function nonFreshElement(tagName, attributes, children) {
diff --git a/lib/style-reader.js b/lib/style-reader.js
index ba453bd..2889554 100644
--- a/lib/style-reader.js
+++ b/lib/style-reader.js
@@ -1,8 +1,8 @@
 var _ = require("underscore");
 var lop = require("lop");
 
-var documentMatchers = require("./document-matchers");
-var htmlPaths = require("./html-paths");
+var documentMatchers = require("./styles/document-matchers");
+var htmlPaths = require("./styles/html-paths");
 var tokenise = require("./styles/parser/tokeniser").tokenise;
 var results = require("./results");
 
diff --git a/lib/document-matchers.js b/lib/styles/document-matchers.js
index bdc213c..bdc213c 100644
--- a/lib/document-matchers.js
+++ b/lib/styles/document-matchers.js
diff --git a/lib/html-paths.js b/lib/styles/html-paths.js
index 8906329..27bb777 100644
--- a/lib/html-paths.js
+++ b/lib/styles/html-paths.js
@@ -1,6 +1,6 @@
 var _ = require("underscore");
 
-var html = require("./html");
+var html = require("../html");
 
 exports.topLevelElement = topLevelElement;
 exports.elements = elements;
diff --git a/lib/underline.js b/lib/underline.js
index fd5dc0f..3c59d0d 100644
--- a/lib/underline.js
+++ b/lib/underline.js
@@ -1,4 +1,4 @@
-var htmlPaths = require("./html-paths");
+var htmlPaths = require("./styles/html-paths");
 var Html = require("./html");
 
 
diff --git a/test/document-to-html.tests.js b/test/document-to-html.tests.js
index 6283b1a..b7a0251 100644
--- a/test/document-to-html.tests.js
+++ b/test/document-to-html.tests.js
@@ -6,10 +6,10 @@ var documentToHtml = require("../lib/document-to-html");
 var DocumentConverter = documentToHtml.DocumentConverter;
 var commentAuthorLabel = documentToHtml.commentAuthorLabel;
 var test = require("./test")(module);
-var htmlPaths = require("../lib/html-paths");
+var htmlPaths = require("../lib/styles/html-paths");
 var xml = require("../lib/xml");
 var results = require("../lib/results");
-var documentMatchers = require("../lib/document-matchers");
+var documentMatchers = require("../lib/styles/document-matchers");
 var Html = require("../lib/html");
 
 
diff --git a/test/html/simplify.tests.js b/test/html/simplify.tests.js
index cec4dc5..85d2eb9 100644
--- a/test/html/simplify.tests.js
+++ b/test/html/simplify.tests.js
@@ -4,7 +4,7 @@ var _ = require("underscore");
 
 var test = require("../test")(module);
 var html = require("../../lib/html");
-var htmlPaths = require("../../lib/html-paths");
+var htmlPaths = require("../../lib/styles/html-paths");
 
 var nonFreshElement = html.nonFreshElement;
 var text = html.text;
diff --git a/test/style-reader.tests.js b/test/style-reader.tests.js
index 3fb5f1f..372e649 100644
--- a/test/style-reader.tests.js
+++ b/test/style-reader.tests.js
@@ -1,6 +1,6 @@
 var assert = require("assert");
-var htmlPaths = require("../lib/html-paths");
-var documentMatchers = require("../lib/document-matchers");
+var htmlPaths = require("../lib/styles/html-paths");
+var documentMatchers = require("../lib/styles/document-matchers");
 var styleReader = require("../lib/style-reader");
 var results = require("../lib/results");
 var test = require("./test")(module);
diff --git a/test/document-matchers.tests.js b/test/styles/document-matchers.tests.js
index b989b2d..e36298c 100644
--- a/test/document-matchers.tests.js
+++ b/test/styles/document-matchers.tests.js
@@ -1,8 +1,8 @@
 var assert = require("assert");
 
-var test = require("./test")(module);
-var documentMatchers = require("../lib/document-matchers");
-var documents = require("../lib/documents");
+var test = require("../test")(module);
+var documentMatchers = require("../../lib/styles/document-matchers");
+var documents = require("../../lib/documents");
 var Paragraph = documents.Paragraph;
 
 test("paragraph with no options matches any paragraph", function() {
diff --git a/test/html-paths.tests.js b/test/styles/html-paths.tests.js
index 8d75b7c..ab24cec 100644
--- a/test/html-paths.tests.js
+++ b/test/styles/html-paths.tests.js
@@ -1,7 +1,7 @@
 var assert = require("assert");
 
-var test = require("./test")(module);
-var htmlPaths = require("../lib/html-paths");
+var test = require("../test")(module);
+var htmlPaths = require("../../lib/styles/html-paths");
 
 
 test("element can match multiple tag names", function() {