Merge branch 'master' into image-errors

Conflicts:
	test/mammoth.tests.js

1 files changed, 17 insertions, 11 deletions

diff --git a/lib/style-reader.js b/lib/style-reader.js
index ab9a171..fe60930 100644
--- a/lib/style-reader.js
+++ b/lib/style-reader.js
@@ -177,16 +177,21 @@ function htmlPathRule() {
         return htmlPaths.element(tagName, attributes, options);
     });
     
-    return lop.rules.then(
-        lop.rules.zeroOrMoreWithSeparator(
-            styleElementRule,
-            lop.rules.sequence(
-                whitespaceRule,
-                lop.rules.tokenOfType("gt"),
-                whitespaceRule
-            )
-        ),
-        htmlPaths.elements
+    return lop.rules.firstOf("html path",
+        lop.rules.then(lop.rules.tokenOfType("bang"), function() {
+            return htmlPaths.ignore;
+        }),
+        lop.rules.then(
+            lop.rules.zeroOrMoreWithSeparator(
+                styleElementRule,
+                lop.rules.sequence(
+                    whitespaceRule,
+                    lop.rules.tokenOfType("gt"),
+                    whitespaceRule
+                )
+            ),
+            htmlPaths.elements
+        )
     );
 }
     
@@ -234,7 +239,8 @@ function tokenise(string) {
         {name: "close-square-bracket", regex: /\]/},
         {name: "string", regex: /'([^']*)'/},
         {name: "integer", regex: /([0-9]+)/},
-        {name: "choice", regex: /\|/}
+        {name: "choice", regex: /\|/},
+        {name: "bang", regex: /(!)/}
     ]);
     return tokeniser.tokenise(string);
 }