typograf 6.12.0 → 6.14.0

package/README.md

@@ -5,7 +5,6 @@
 [![NPM version](https://img.shields.io/npm/v/typograf.svg?style=flat)](https://www.npmjs.com/package/typograf)
 [![NPM downloads](https://img.shields.io/npm/dm/typograf.svg?style=flat)](https://www.npmjs.com/package/typograf)
 [![Coverage Status](https://img.shields.io/coveralls/typograf/typograf.svg?style=flat)](https://coveralls.io/r/typograf/typograf)
-[![Dependency Status](https://img.shields.io/david/typograf/typograf.svg?style=flat)](https://david-dm.org/typograf/typograf)
 [![bundlephobia](https://badgen.net/bundlephobia/minzip/typograf)](https://bundlephobia.com/result?p=typograf)
 
 Помогает автоматически расставить неразрывные пробелы, исправить мелкие опечатки, привести кавычки к правильному виду, заменить дефисы на тире в нужных местах и многое другое.

package/dist/typograf.all.js

@@ -52,7 +52,7 @@
   }
 
   function _iterableToArrayLimit(arr, i) {
-    var _i = arr && (typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]);
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
 
     if (_i == null) return;
     var _arr = [];
@@ -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.12.0';
+  Typograf.version = '6.14.0';
   Typograf.addLocale = addLocale;
   Typograf.getLocales = getLocales;
   Typograf.hasLocale = hasLocale;
@@ -1630,7 +1634,7 @@
   var afterNumber = {
     name: 'common/nbsp/afterNumber',
     handler: function handler(text, settings, context) {
-      var re = '(^|\\D)(\\d{1,5}) ([' + context.getData('char') + ']+)';
+      var re = '(^|\\s)(\\d{1,5}) ([' + context.getData('char') + ']+)';
       return text.replace(new RegExp(re, 'gi'), "$1$2\xA0$3");
     },
     disabled: true
@@ -1823,12 +1827,12 @@
     }
   };
 
+  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) {
@@ -1935,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) {
@@ -2037,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 = leftQuotes.length - 1;
+      var minLevel = 0;
+      var maxLevel = this.getMaxLevel(text, lquote, rquote, settings.left.length);
       var level = minLevel;
       var result = '';
 
@@ -2056,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;
@@ -2084,8 +2075,11 @@
         }
       }
 
-      var count = this.count(result, settings);
-      return count[lquote] !== count[rquote] ? text : result;
+      return result;
+    },
+    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 = {
@@ -2137,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) {
@@ -2277,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',
@@ -2649,7 +2676,7 @@
       var spaces = "\xA0\u202F "; // nbsp, thinsp
 
       var quote = getData('ru/quote');
-      var re = new RegExp('(^|[' + spaces + quote.left + privateLabel + '"])([А-ЯЁ])\\.[' + spaces + ']?([А-ЯЁ])\\.[' + spaces + ']?([А-ЯЁ][а-яё]+)(?=[\\s.,;:?!"' + quote.right + ']|$)', 'gm');
+      var re = new RegExp('(^|[' + spaces + quote.left + privateLabel + '"])([А-ЯЁ])\\.[' + spaces + ']?([А-ЯЁ])\\.[' + spaces + ']?([А-ЯЁ][а-яё]+)(?=[\\s.,;:?!"' + quote.right + privateLabel + ']|$)', 'gm');
       return text.replace(re, "$1$2.\xA0$3.\xA0$4");
     }
   };
@@ -3009,11 +3036,9 @@
   var ano = {
     name: 'ru/punctuation/ano',
     handler: function handler(text) {
-      var re = new RegExp("([^\xAB\u201E[(!?,:;\\-\u2012\u2013\u2014\\s])(\\s+)(\u0430|\u043D\u043E)(?= |\xA0|\\n)", 'g');
+      var re = new RegExp('([^«„[(!?,:;\\-‒–—\\s' + privateLabel + "])(\\s+)(\u0430|\u043D\u043E)(?= |\xA0|\\n)", 'g');
       return text.replace(re, '$1,$2$3');
-    },
-    // Запятая может идти после ссылки.
-    queue: 'hide-safe-tags-html'
+    }
   };
 
   var exclamation = {
@@ -3217,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",