Changeset 434

Timestamp:

Nov 8, 2013 3:56:09 AM (10 years ago)

Author:

anonymous

Message:

Improved SpellCheck? preg pattern

File:

• branches/1.1dev/lib/SpellCheck.inc.php (modified) (7 diffs)

branches/1.1dev/lib/SpellCheck.inc.php

@@ -186 +186 @@
     
     /**
-     * Returns an array of suggested words for each mispelled word in the given text.
+     * Returns an array of suggested words for each misspelled word in the given text.
      * The first word of the returned array is the (possibly) misspelled word.
      *
@@ -201 +201 @@
         // Split words on punctuation except apostrophes (this regex is used in several places in this class).
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
-        $words = preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(\p{P}+$))/", $string);
+        $words = preg_split("/((?:^\p{P}+)|(?:\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(?:\p{P}+$))/", $string, -1, PREG_SPLIT_DELIM_CAPTURE);
         if (is_array($words) && !empty($words)) {
             // Remove non-word elements.
@@ -237 +237 @@
         // Split words on punctuation except apostrophes (this regex is used in several places in this class).
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
-        $words = preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(\p{P}+$))/", $string);
+        $words = preg_split("/((?:^\p{P}+)|(?:\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(?:\p{P}+$))/", $string, -1, PREG_SPLIT_DELIM_CAPTURE);
         if (is_array($words) && !empty($words)) {
             // Remove non-word elements.
@@ -270 +270 @@
         // Split words on punctuation except apostrophes (this regex is used in several places in this class).
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
-        $words = preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(\p{P}+$))/", $string);
+        $words = preg_split("/((?:^\p{P}+)|(?:\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(?:\p{P}+$))/", $string, -1, PREG_SPLIT_DELIM_CAPTURE);
         $cnt = 0;
         if (is_array($words) && !empty($words)) {
@@ -279 +279 @@
                     $footnote = $show_footnote ? '<sup style="color:#999;">' . ++$cnt . '</sup>' : '';
                     $words[$i] = $this->getParam('highlight_start') . $word . $this->getParam('highlight_end') . $footnote;
-                }
-            }
-        }
-        return join(' ', $words);
-    }
-    
-    /**
-     * Prints the HTML for correcting all mispellings found in the text of one $_FORM element.
+                    $string = preg_replace("/\b$word\b/", $words[$i], $string);
+                }
+            }
+        }
+        return $string;
+        // return join(' ', $words);
+    }
+    
+    /**
+     * Prints the HTML for correcting all misspellings found in the text of one $_FORM element.
      *
      * @access  public
@@ -361 +363 @@
         // Split words on punctuation except apostrophes (this regex is used in several places in this class).
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
-        $form_words = preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(\p{P}+$))/", getFormData($form_name));
+        $form_words = preg_split("/((?:^\p{P}+)|(?:\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(?:\p{P}+$))/", getFormData($form_name), -1, PREG_SPLIT_DELIM_CAPTURE);
         $suggestions = getFormData('spelling_suggestions');
         $corrections = getFormData('spelling_corrections');
@@ -379 +381 @@
 
         if (is_array($form_words) && !empty($form_words)) {
-            return join(' ', $form_words);
+            return join('', $form_words);
         } else {
             return getFormData($form_name);