Changeset 498

Timestamp:

04/30/06 09:46:23 (7 years ago)

Author:

gogo

Message:

Add config value SpellChecker.utf8_to_entities which can be set to
false to stop SpellChecker from converting (multi byte) utf8
characters to entities before passing to aspell - ticket:120
indicates this is not required. Config value is true by default for
backwards compatability.

Location:

trunk/plugins/SpellChecker

Files:

• spell-check-logic.php (modified) (1 diff)
• spell-check-ui.html (modified) (1 diff)
• spell-check-ui.js (modified) (1 diff)
• spell-checker.js (modified) (1 diff)

trunk/plugins/SpellChecker/spell-check-logic.php

@@ -3 +3 @@
 
   // Convert UTF-8 multi-bytes into decimal character entities.  This is because
-  // aspell isn't fully utf8-aware
-  $text = preg_replace('/([\xC0-\xDF][\x80-\xBF])/e', "'&#' . utf8_ord('\$1') . ';'", $text);
-  $text = preg_replace('/([\xE0-\xEF][\x80-\xBF][\x80-\xBF])/e',             "'&#' . utf8_ord('\$1') . ';'",  $text);
-  $text = preg_replace('/([\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])/e', "'&#' . utf8_ord('\$1') . ';'",   $text);
-
+  // aspell isn't fully utf8-aware - ticket:120 raises the possibility 
+  // that this is not required (any more) and so you can turn it off
+  // with editor.config.SpellChecker.utf8_to_entities = false 
+  if(!isset($_REQUEST['utf8_to_entitis']) || $_REQUEST['utf8_to_entities'])
+  {
+    $text = preg_replace('/([\xC0-\xDF][\x80-\xBF])/e', "'&#' . utf8_ord('\$1') . ';'", $text);
+    $text = preg_replace('/([\xE0-\xEF][\x80-\xBF][\x80-\xBF])/e',             "'&#' . utf8_ord('\$1') . ';'",  $text);
+    $text = preg_replace('/([\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])/e', "'&#' . utf8_ord('\$1') . ';'",   $text);
+  }
+  
   function utf8_ord($chr)
   {

trunk/plugins/SpellChecker/spell-check-ui.html

@@ -63 +63 @@
           /><input type="hidden" name="dictionary" id="f_dictionary"
           /><input type="hidden" name="init" id="f_init" value="1"
+          /><input type="hidden" name="utf8_to_entities" id="utf8_to_entities" value="1"
     /></form>
 

trunk/plugins/SpellChecker/spell-check-ui.js

@@ -216 +216 @@
     field.form.action = _editor_url + '/plugins/SpellChecker/spell-check-logic.php';
   }
-
+  if(editor.config.SpellChecker.utf8_to_entities)
+  {
+    document.getElementById('utf8_to_entities').value = 1;
+  }
+  else
+  {
+    document.getElementById('utf8_to_entities').value = 0;
+  }
   field.form.submit();
   document.getElementById("f_init").value = "0";

trunk/plugins/SpellChecker/spell-checker.js

@@ -9 +9 @@
 // $Id$
 
-HTMLArea.Config.prototype.SpellChecker = { 'backend': 'php', 'personalFilesDir' : '', 'defaultDictionary' : 'en_GB' };
+HTMLArea.Config.prototype.SpellChecker = { 'backend': 'php', 'personalFilesDir' : '', 'defaultDictionary' : 'en_GB', 'utf8_to_entities' : true };
 
 function SpellChecker(editor) {