Ticket #23185: FixHyphens.diff

wp-includes/formatting.php

@@ -70 +70 @@
                         $cockney = $cockneyreplace = array();
                 }
 
-                $static_characters = array_merge( array( '---', ' -- ', '--', ' - ', 'xn–', '...', '``', '\'\'', ' (tm)' ), $cockney );
-                $static_replacements = array_merge( array( $em_dash, ' ' . $em_dash . ' ', $en_dash, ' ' . $en_dash . ' ', 'xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
+                $static_characters = array_merge( array('xn–', '...', '``', '\'\'', ' (tm)' ), $cockney );
+                $static_replacements = array_merge( array('xn--', '…', $opening_quote, $closing_quote, ' ™' ), $cockneyreplace );
 
                 $dynamic = array();
                 if ( "'" != $apos ) {
@@ -95 +95 @@
 
                 $dynamic[ '/\b(\d+)x(\d+)\b/'              ] = '$1×$2'; // 9x9 (times)
 
+                $dynamic[ '/---/' ] = $em_dash; // Triple-hyphen becomes em dash
+
+                // Hyphen or double-hyphen surrounded by space become en or em dash
+                $dynamic[ '/( | )-( | )/' ] = '$1' . $en_dash . '$2';
+                $dynamic[ '/( | )--( | )/' ] = '$1' . $em_dash . '$2';
+
+                $dynamic[ '/--/' ] = $en_dash; // Remaining double-hyphens become en-dash
+
                 $dynamic_characters = array_keys( $dynamic );
                 $dynamic_replacements = array_values( $dynamic );
         }