typograf 6.13.0 → 6.14.0

package/dist/typograf.all.js

@@ -380,6 +380,10 @@
 
   var regExpUrl = new RegExp('(https?|file|ftp)://([a-zA-Z0-9/+-=%&:_.~?]+[a-zA-Z0-9#+]*)', 'g');
   var regExpNumber = '\\d+([.,]\\d+)?';
+  var regExpDigit = /\d/;
+  function isDigit(symbol) {
+    return symbol.search(regExpDigit) > -1;
+  }
 
   var privateLabel = "\uF000";
   var privateSeparateLabel = "\uF001";
@@ -1211,7 +1215,7 @@
 
     return Typograf;
   }();
-  Typograf.version = '6.13.0';
+  Typograf.version = '6.14.0';
   Typograf.addLocale = addLocale;
   Typograf.getLocales = getLocales;
   Typograf.hasLocale = hasLocale;
@@ -1823,13 +1827,12 @@
     }
   };
 
-  var MAX_LEVEL_WITH_ERRORS = 1;
+  var MAX_LEVEL_WITH_ERRORS = 2;
   var Quote = {
     bufferQuotes: {
       left: "\uF005\uF006\uF007",
       right: "\uF008\uF009\uF0A0"
     },
-    maxLevel: 3,
     beforeLeft: " \n\t\xA0[(",
     afterRight: " \n\t\xA0!?.:;#*,\u2026)\\]",
     process: function process(params) {
@@ -1936,8 +1939,8 @@
       var lquote = params.settings.left[0];
       var lquote2 = params.settings.left[1] || lquote;
       var rquote = params.settings.right[0];
-      var reL = new RegExp('(^|[' + this.beforeLeft + '])([' + quotes + ']{1,' + this.maxLevel + '})(?=[^\\s' + privateLabel + '])', 'gim');
-      var reR = new RegExp('([^\\s' + privateLabel + '])([' + quotes + ']{1,' + this.maxLevel + '})(?=[' + this.afterRight + ']|$)', 'gim');
+      var reL = new RegExp('(^|[' + this.beforeLeft + '])([' + quotes + ']+)(?=[^\\s' + privateLabel + '])', 'gim');
+      var reR = new RegExp('([^\\s' + privateLabel + '])([' + quotes + ']+)(?=[' + this.afterRight + ']|$)', 'gim');
       text = text.replace(reL, function ($0, $1, $2) {
         return $1 + repeat(lquote, $2.length);
       }).replace(reR, function ($0, $1, $2) {
@@ -2038,18 +2041,10 @@
       return null;
     },
     setInner: function setInner(text, settings) {
-      var leftQuotes = [];
-      var rightQuotes = [];
-
-      for (var k = 0; k < settings.left.length; k++) {
-        leftQuotes.push(settings.left[k]);
-        rightQuotes.push(settings.right[k]);
-      }
-
       var lquote = settings.left[0];
       var rquote = settings.right[0];
-      var minLevel = -1;
-      var maxLevel = this.getMaxLevel(text, settings);
+      var minLevel = 0;
+      var maxLevel = this.getMaxLevel(text, lquote, rquote, settings.left.length);
       var level = minLevel;
       var result = '';
 
@@ -2057,25 +2052,20 @@
         var letter = text[i];
 
         if (letter === lquote) {
+          result += settings.left[level > maxLevel - 1 ? maxLevel - 1 : level];
           level++;
 
           if (level > maxLevel) {
             level = maxLevel;
           }
-
-          result += leftQuotes[level];
         } else if (letter === rquote) {
-          if (level <= minLevel) {
-            level = 0;
-            result += rightQuotes[level];
-          } else {
-            result += rightQuotes[level];
-            level--;
-
-            if (level < minLevel) {
-              level = minLevel;
-            }
+          level--;
+
+          if (level < minLevel) {
+            level = minLevel;
           }
+
+          result += settings.right[level];
         } else {
           if (letter === '"') {
             level = minLevel;
@@ -2087,11 +2077,9 @@
 
       return result;
     },
-    getMaxLevel: function getMaxLevel(text, settings) {
-      var count = this.count(text, settings);
-      var leftQuotesCount = count[settings.left[0]] || 0;
-      var rightQuotesCount = count[settings.right[0]] || 0;
-      return leftQuotesCount === rightQuotesCount ? settings.left.length - 1 : Math.min(settings.left.length - 1, MAX_LEVEL_WITH_ERRORS);
+    getMaxLevel: function getMaxLevel(text, leftQuote, rightQuote, length) {
+      var count = this.count(text);
+      return count[leftQuote] === count[rightQuote] ? length : Math.min(length, MAX_LEVEL_WITH_ERRORS);
     }
   };
   var quote = {
@@ -2143,15 +2131,6 @@
 
   Typograf.addRules([apostrophe, delDoublePunctuation, hellip, quote, quoteLink]);
 
-  var afterPunctuation = {
-    name: 'common/space/afterPunctuation',
-    handler: function handler(text) {
-      var reExcl = new RegExp('(!|;|\\?)([^).…!;?\\s[\\])' + privateLabel + getData('common/quote') + '])', 'g');
-      var reComma = new RegExp('(\\D)(,|:)([^)",:.?\\s\\/\\\\' + privateLabel + '])', 'g');
-      return text.replace(reExcl, '$1 $2').replace(reComma, '$1$2 $3');
-    }
-  };
-
   var beforeBracket = {
     name: 'common/space/beforeBracket',
     handler: function handler(text, settings, context) {
@@ -2283,7 +2262,49 @@
     }
   };
 
-  Typograf.addRules([afterPunctuation, beforeBracket, bracket, delBeforeDot, delBeforePercent, delBeforePunctuation, delBetweenExclamationMarks, delLeadingBlanks, delRepeatN, delRepeatSpace, delTrailingBlanks, insertFinalNewline, replaceTab, squareBracket, trimLeft, trimRight]);
+  var reColon = new RegExp('(\\D):([^)",:.?\\s\\/\\\\' + privateLabel + '])', 'g');
+  var afterColon = {
+    name: 'common/space/afterColon',
+    handler: function handler(text) {
+      return text.replace(reColon, '$1: $2');
+    }
+  };
+
+  var reComma = new RegExp('(.),([^)",:.?\\s\\/\\\\' + privateLabel + '])', 'g');
+  var afterComma = {
+    name: 'common/space/afterComma',
+    handler: function handler(text) {
+      return text.replace(reComma, function ($0, $1, $2) {
+        return isDigit($1) && isDigit($2) ? $0 : $1 + ', ' + $2;
+      });
+    }
+  };
+
+  var reQuestionMark = new RegExp('\\?([^).…!;?\\s[\\])' + privateLabel + getData('common/quote') + '])', 'g');
+  var afterQuestionMark = {
+    name: 'common/space/afterQuestionMark',
+    handler: function handler(text) {
+      return text.replace(reQuestionMark, '? $1');
+    }
+  };
+
+  var reExclamationMark = new RegExp('!([^).…!;?\\s[\\])' + privateLabel + getData('common/quote') + '])', 'g');
+  var afterExclamationMark = {
+    name: 'common/space/afterExclamationMark',
+    handler: function handler(text) {
+      return text.replace(reExclamationMark, '! $1');
+    }
+  };
+
+  var reSemicolon = new RegExp(';([^).…!;?\\s[\\])' + privateLabel + getData('common/quote') + '])', 'g');
+  var afterSemicolon = {
+    name: 'common/space/afterSemicolon',
+    handler: function handler(text) {
+      return text.replace(reSemicolon, '; $1');
+    }
+  };
+
+  Typograf.addRules([afterColon, afterComma, afterQuestionMark, afterExclamationMark, afterSemicolon, beforeBracket, bracket, delBeforeDot, delBeforePercent, delBeforePunctuation, delBetweenExclamationMarks, delLeadingBlanks, delRepeatN, delRepeatSpace, delTrailingBlanks, insertFinalNewline, replaceTab, squareBracket, trimLeft, trimRight]);
 
   var arrow = {
     name: 'common/symbols/arrow',
@@ -3221,9 +3242,25 @@
       "en-US": "Removal quotes outside a link",
       "ru": "Вынос кавычек за пределы ссылки"
     },
-    "common/space/afterPunctuation": {
-      "en-US": "space after punctuation",
-      "ru": "Пробел после знаков пунктуации"
+    "common/space/afterColon": {
+      "en-US": "space after colon",
+      "ru": "Пробел после двоеточия"
+    },
+    "common/space/afterComma": {
+      "en-US": "space after comma",
+      "ru": "Пробел после запятой"
+    },
+    "common/space/afterExclamationMark": {
+      "en-US": "space after exclamation mark",
+      "ru": "Пробел после знака восклицания"
+    },
+    "common/space/afterQuestionMark": {
+      "en-US": "space after question mark",
+      "ru": "Пробел после знака вопроса"
+    },
+    "common/space/afterSemicolon": {
+      "en-US": "space after semicolon",
+      "ru": "Пробел после точки с запятой"
     },
     "common/space/beforeBracket": {
       "en-US": "Space before opening bracket",