Rename smallCaps style mapping to small-caps

3 files changed, 7 insertions, 8 deletions

diff --git a/lib/document-to-html.js b/lib/document-to-html.js
index 83e78fd..0dac05e 100644
--- a/lib/document-to-html.js
+++ b/lib/document-to-html.js
@@ -127,6 +127,9 @@ function DocumentConversion(options, comments) {
             return convertElements(run.children, messages, options);
         };
         var paths = [];
+        if (run.isSmallCaps) {
+            paths.push(findHtmlPathForRunProperty("smallCaps"));
+        }
         if (run.isStrikethrough) {
             paths.push(findHtmlPathForRunProperty("strikethrough", "s"));
         }
@@ -145,9 +148,6 @@ function DocumentConversion(options, comments) {
         if (run.isBold) {
             paths.push(findHtmlPathForRunProperty("bold", "strong"));
         }
-        if (run.isSmallCaps) {
-            paths.push(findHtmlPathForRunProperty("smallCaps"));
-        }
         var stylePath = htmlPaths.empty;
         var style = findStyle(run);
         if (style) {
diff --git a/lib/style-reader.js b/lib/style-reader.js
index 32a2920..692672e 100644
--- a/lib/style-reader.js
+++ b/lib/style-reader.js
@@ -137,6 +137,7 @@ function documentMatcherRule() {
     var italic = identifierToConstant("i", documentMatchers.italic);
     var underline = identifierToConstant("u", documentMatchers.underline);
     var strikethrough = identifierToConstant("strike", documentMatchers.strikethrough);
+    var smallCaps = identifierToConstant("small-caps", documentMatchers.smallCaps);
     var commentReference = identifierToConstant("comment-reference", documentMatchers.commentReference);
     
     var breakMatcher = sequence(
@@ -160,17 +161,15 @@ function documentMatcherRule() {
         }
     });
 
-    var smallCaps = identifierToConstant("smallCaps", documentMatchers.smallCaps);
-    
     return lop.rules.firstOf("element type",
         paragraphOrRun,
         bold,
         italic,
         underline,
         strikethrough,
+        smallCaps,
         commentReference,
-        breakMatcher,
-        smallCaps
+        breakMatcher
     );
 }
 
diff --git a/lib/styles/document-matchers.js b/lib/styles/document-matchers.js
index 3548d65..e3cae46 100644
--- a/lib/styles/document-matchers.js
+++ b/lib/styles/document-matchers.js
@@ -4,8 +4,8 @@ exports.bold = new Matcher("bold");
 exports.italic = new Matcher("italic");
 exports.underline = new Matcher("underline");
 exports.strikethrough = new Matcher("strikethrough");
-exports.commentReference = new Matcher("commentReference");
 exports.smallCaps = new Matcher("smallCaps");
+exports.commentReference = new Matcher("commentReference");
 exports.lineBreak = new Matcher("break", {breakType: "line"});
 exports.pageBreak = new Matcher("break", {breakType: "page"});
 exports.columnBreak = new Matcher("break", {breakType: "column"});