Ticket #30966: 30966.11.patch

src/wp-admin/js/word-count.js

@@ -14 +14 @@
         WordCounter.prototype.settings = {
                 HTMLRegExp: /<\/?[a-z][^>]*?>/gi,
                 spaceRegExp: /&nbsp;|&#160;/gi,
-                removeRegExp: /[0-9.(),;:!?%#$¿'"_+=\\\/-]+/g,
+                connectorRegExp: /--|\u2014/gi,
+                removeRegExp: new RegExp( [
+                        '[',
+                                // Basic Latin (extract)
+                                '\u0021-\u0040\u005B-\u0060\u007B-\u007E',
+                                // Latin-1 Supplement (extract)
+                                '\u0080-\u00BF\u00D7\u00F7',
+                                // General Punctuation
+                                // Superscripts and Subscripts
+                                // Currency Symbols
+                                // Combining Diacritical Marks for Symbols
+                                // Letterlike Symbols
+                                // Number Forms
+                                // Arrows
+                                // Mathematical Operators
+                                // Miscellaneous Technical
+                                // Control Pictures
+                                // Optical Character Recognition
+                                // Enclosed Alphanumerics
+                                // Box Drawing
+                                // Block Elements
+                                // Geometric Shapes
+                                // Miscellaneous Symbols
+                                // Dingbats
+                                // Miscellaneous Mathematical Symbols-A
+                                // Supplemental Arrows-A
+                                // Braille Patterns
+                                // Supplemental Arrows-B
+                                // Miscellaneous Mathematical Symbols-B
+                                // Supplemental Mathematical Operators
+                                // Miscellaneous Symbols and Arrows
+                                '\u2000-\u2BFF',
+                                // Supplemental Punctuation
+                                '\u2E00-\u2E7F',
+                        ']'
+                ].join( '' ), 'g' ),
                 wordsRegExp: /\S\s+/g,
                 charactersRegExp: /\S/g,
                 allRegExp: /[^\f\n\r\t\v\u00ad\u2028\u2029]/g,
@@ -31 +66 @@
 
                         text = text.replace( this.settings.HTMLRegExp, '\n' );
                         text = text.replace( this.settings.spaceRegExp, ' ' );
-                        text = text.replace( this.settings.removeRegExp, '' );
+
+                        if ( type === 'words' ) {
+                                text = text.replace( this.settings.connectorRegExp, ' ' );
+                                text = text.replace( this.settings.removeRegExp, '' );
+                        }
 
                         text = text.match( this.settings[ type + 'RegExp' ] );
 

tests/qunit/wp-admin/js/word-count.js

@@ -35 +35 @@
                                 message: 'Punctuation.',
                                 string: 'It\'s two three... 4?',
                                 words: 3,
-                                characters: 11,
+                                characters: 17,
+                                all: 20
+                        },
+                        {
+                                message: 'Em dash.',
+                                string: 'one\u2014two--three',
+                                words: 3,
+                                characters: 14,
                                 all: 14
                         }
                 ], function( test ) {