Merge 625b3d1 into 0897168

typograf · Oct 15, 2018 · 3a632b0 · 3a632b0
2 parents 0897168 + 625b3d1
commit 3a632b0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/src/rules/common/html/e-mail.js b/src/rules/common/html/e-mail.js
@@ -3,7 +3,7 @@ Typograf.addRule({
     queue: 'end',
     handler(text, settings, context) {
         return context.isHTML ? text : text.replace(
-            /(^|[\s;(])([\w\-.]{2,})@([\w\-.]{2,})\.([a-z]{2,6})([)\s.,!?]|$)/gi,
+            /(^|[\s;(])([\w\-.]{2,64})@([\w\-.]{2,64})\.([a-z]{2,64})([)\s.,!?]|$)/gi,
             '$1<a href="mailto:$2@$3.$4">$2@$3.$4</a>$5'
         );
     },

diff --git a/src/rules/common/nbsp/afterNumber.js b/src/rules/common/nbsp/afterNumber.js
@@ -3,7 +3,7 @@ Typograf.addRule({
     handler(text, settings, context) {
         const re = '(^|\\D)(\\d{1,5}) ([' +
             context.getData('char') +
-            ']{2,})';
+            ']+)';
 
         return text.replace(new RegExp(re, 'gi'), '$1$2\u00A0$3');
     },

diff --git a/src/rules/common/nbsp/afterNumber.spec.js b/src/rules/common/nbsp/afterNumber.spec.js
@@ -15,6 +15,10 @@ tests.push([
         [
             '20 years',
             '20\u00A0years'
+        ],
+        [
+            'Кукурузные палочки Кузя Лакомкин 85 г',
+            'Кукурузные палочки Кузя Лакомкин 85\u00A0г'
         ]
     ],
     {locale: ['ru', 'en-US']}

diff --git a/src/rules/ru/nbsp/groupNumbers.js b/src/rules/ru/nbsp/groupNumbers.js
@@ -1,7 +1,9 @@
 Typograf.addRule({
     name: 'ru/nbsp/groupNumbers',
     handler(text) {
-        return text.replace(/(^ ?|\D )(\d{1,3}([ \u00A0\u202F\u2009]\d{3})+)(?! ?[\d-])/gm, function($0, $1, $2) {
+        const re = new RegExp(`(^ ?|\\D |${Typograf._privateLabel})(\\d{1,3}([ \u00A0\u202F\u2009]\\d{3})+)(?! ?[\\d-])`, 'gm');
+
+        return text.replace(re, function($0, $1, $2) {
             return $1 + $2.replace(/\s/g, '\u202F');
         });
     }

diff --git a/src/rules/ru/nbsp/groupNumbers.spec.js b/src/rules/ru/nbsp/groupNumbers.spec.js
@@ -26,5 +26,13 @@ tests.push(['ru/nbsp/groupNumbers', [
     [
         '000 22 000',
         '000 22 000'
+    ],
+    [
+        '123 456,789',
+        '123\u202F456,789'
+    ],
+    [
+        '<span>123 456,789</span>',
+        '<span>123\u202F456,789</span>'
     ]
 ]]);