From 2deb165f4b07bbac98e6ce4b4e983073dd9ff6a3 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Fri, 13 Jul 2012 16:15:20 +0000
Subject: [PATCH] Update test_spellfix.c with latest changes.

FossilOrigin-Name: cba2a65870481df213e006b07e74f0ca19d2d57c
---
 manifest            |   16 +-
 manifest.uuid       |    2 +-
 src/test8.c         |   30 +-
 src/test_spellfix.c | 1461 +++++++++++++++++++++++++++++++++++++------
 4 files changed, 1322 insertions(+), 187 deletions(-)

diff --git a/manifest b/manifest
index f2ab12f8b8..4901be8cae 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Setup\sthe\snecessary\slibrary\spaths\sfor\scross-compilation\swith\sMSVC.
-D 2012-06-30T22:22:34.095
+C Update\stest_spellfix.c\swith\slatest\schanges.
+D 2012-07-13T16:15:20.128
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -192,7 +192,7 @@ F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
 F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
 F src/test6.c 417e1e214734393c24a8ee80b41485a9c4169123
 F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
-F src/test8.c 235f1d19716fa768c46fc461ccbf529b2c9e4399
+F src/test8.c c4bcd39c9b157a28f5c4efefbb6bb1174037cace
 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
 F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
 F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
@@ -221,7 +221,7 @@ F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
 F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
-F src/test_spellfix.c 495535f3eb57acdc384572da570e869bb1834bf4
+F src/test_spellfix.c 1de8d8c086efa50bb6660ea5988e8630ef9144aa
 F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 03016020664a7459cb01c8ac9016b20af8a416bb
-R 3838aec4be451692e3019372e4566300
-U mistachkin
-Z 6999152625f8f616344bc02a959eabf4
+P 7fac56ed9feda819e66070bd5e06db8cad77e8bd
+R 8322d35d4441c91cd733d64b44bd2f2e
+U dan
+Z 4817f8644451c5f84c464c55e7d56257
diff --git a/manifest.uuid b/manifest.uuid
index d46c3a3f2a..45760e0dc2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7fac56ed9feda819e66070bd5e06db8cad77e8bd
\ No newline at end of file
+cba2a65870481df213e006b07e74f0ca19d2d57c
\ No newline at end of file
diff --git a/src/test8.c b/src/test8.c
index 372eef664a..5ee62961f8 100644
--- a/src/test8.c
+++ b/src/test8.c
@@ -1370,6 +1370,31 @@ static int declare_vtab(
   return TCL_OK;
 }
 
+#include "test_spellfix.c"
+
+/*
+** Register the spellfix virtual table module.
+*/
+static int register_spellfix_module(
+  ClientData clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  static sqlite3_module aMod[3];
+  int iMod;
+  sqlite3 *db;
+
+  if( objc!=2 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "DB");
+    return TCL_ERROR;
+  }
+  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
+
+  sqlite3Spellfix1Register(db);
+  return TCL_OK;
+}
+
 #endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
 
 /*
@@ -1382,8 +1407,9 @@ int Sqlitetest8_Init(Tcl_Interp *interp){
      Tcl_ObjCmdProc *xProc;
      void *clientData;
   } aObjCmd[] = {
-     { "register_echo_module",   register_echo_module, 0 },
-     { "sqlite3_declare_vtab",   declare_vtab, 0 },
+     { "register_echo_module",       register_echo_module, 0 },
+     { "register_spellfix_module",   register_spellfix_module, 0 },
+     { "sqlite3_declare_vtab",       declare_vtab, 0 },
   };
   int i;
   for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){
diff --git a/src/test_spellfix.c b/src/test_spellfix.c
index 5a221e0b1b..67a9920932 100644
--- a/src/test_spellfix.c
+++ b/src/test_spellfix.c
@@ -165,8 +165,8 @@
 **                  as "N".  And so forth.  The mapping is base on
 **                  ideas found in Soundex, Metaphone, and other
 **                  long-standing phonetic matching systems.  This key can
-**                  be generated by the function spellfix1_charclass(X).  
-**                  Hence: k2 = spellfix1_charclass(k1)
+**                  be generated by the function spellfix1_phonehash(X).  
+**                  Hence: k2 = spellfix1_phonehash(k1)
 **
 ** There is also a function for computing the Wagner edit distance or the
 ** Levenshtein distance between a pattern and a word.  This function
@@ -201,7 +201,7 @@
 ** the search space, X is converted to a k2-like key using the
 ** equivalent of:
 **
-**    key = spellfix1_charclass(lower(spellfix1_translit(X)))
+**    key = spellfix1_phonehash(lower(spellfix1_translit(X)))
 **
 ** This key is then limited to "scope" characters.  The default scope
 ** value is 4, but an alternative scope can be specified using the
@@ -285,6 +285,7 @@
 # include "sqlite3ext.h"
   SQLITE_EXTENSION_INIT1
 #endif /* !SQLITE_CORE */
+#include <ctype.h>
 
 /*
 ** Character classes for ASCII characters:
@@ -295,13 +296,14 @@
 **   3   'C'       Other fricatives or back stops:  C G J K Q S X Z
 **   4   'D'       Alveolar stops:  D T
 **   5   'H'       Letter H at the beginning of a word
-**   6   'L'       Glides:  L R
-**   7   'M'       Nasals:  M N
-**   8   'W'       Letter W at the beginning of a word
-**   9   'Y'       Letter Y at the beginning of a word.
-**   10  '9'       A digit: 0 1 2 3 4 5 6 7 8 9
-**   11  ' '       White space
-**   12  '?'       Other.
+**   6   'L'       Glide:  L
+**   7   'R'       Semivowel:  R
+**   8   'M'       Nasals:  M N
+**   9   'W'       Letter W at the beginning of a word
+**   10  'Y'       Letter Y at the beginning of a word.
+**   11  '9'       A digit: 0 1 2 3 4 5 6 7 8 9
+**   12  ' '       White space
+**   13  '?'       Other.
 */
 #define CCLASS_SILENT         0
 #define CCLASS_VOWEL          1
@@ -310,76 +312,177 @@
 #define CCLASS_D              4
 #define CCLASS_H              5
 #define CCLASS_L              6
-#define CCLASS_M              7
-#define CCLASS_W              8
-#define CCLASS_Y              9
-#define CCLASS_DIGIT         10
-#define CCLASS_SPACE         11
-#define CCLASS_OTHER         12
+#define CCLASS_R              7
+#define CCLASS_M              8
+#define CCLASS_W              9
+#define CCLASS_Y             10
+#define CCLASS_DIGIT         11
+#define CCLASS_SPACE         12
+#define CCLASS_OTHER         13
 
 /*
 ** The following table gives the character class for non-initial ASCII
 ** characters.
 */
 static const unsigned char midClass[] = {
-          /* x0  x1  x2  x3  x4  x5  x6  x7    x8  x9  xa  xb  xc  xd  xe  xf */
-  /* 0x */   12, 12, 12, 12, 12, 12, 12, 12,   12, 11, 11, 12, 11, 12, 12, 12,
-  /* 1x */   12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-  /* 2x */   11, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-  /* 3x */   10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 12, 12, 12, 12, 12, 12,
-  /* 4x */   12,  1,  2,  3,  4,  1,  2,  3,    0,  1,  3,  3,  6,  7,  7,  1,
-  /* 5x */    2,  3,  6,  3,  4,  1,  2,  0,    3,  1,  3, 12, 12, 12, 12, 12,
-  /* 6x */   12,  1,  2,  3,  4,  1,  2,  3,    0,  1,  3,  3,  6,  7,  7,  1,
-  /* 7x */    2,  3,  6,  3,  4,  1,  2,  0,    3,  1,  3, 12, 12, 12, 12, 12,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_SPACE,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_SPACE,    /*   */ CCLASS_SPACE,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_SPACE,
+ /* ! */ CCLASS_OTHER,    /* " */ CCLASS_OTHER,   /* # */ CCLASS_OTHER,
+ /* $ */ CCLASS_OTHER,    /* % */ CCLASS_OTHER,   /* & */ CCLASS_OTHER,
+ /* ' */ CCLASS_SILENT,   /* ( */ CCLASS_OTHER,   /* ) */ CCLASS_OTHER,
+ /* * */ CCLASS_OTHER,    /* + */ CCLASS_OTHER,   /* , */ CCLASS_OTHER,
+ /* - */ CCLASS_OTHER,    /* . */ CCLASS_OTHER,   /* / */ CCLASS_OTHER,
+ /* 0 */ CCLASS_DIGIT,    /* 1 */ CCLASS_DIGIT,   /* 2 */ CCLASS_DIGIT,
+ /* 3 */ CCLASS_DIGIT,    /* 4 */ CCLASS_DIGIT,   /* 5 */ CCLASS_DIGIT,
+ /* 6 */ CCLASS_DIGIT,    /* 7 */ CCLASS_DIGIT,   /* 8 */ CCLASS_DIGIT,
+ /* 9 */ CCLASS_DIGIT,    /* : */ CCLASS_OTHER,   /* ; */ CCLASS_OTHER,
+ /* < */ CCLASS_OTHER,    /* = */ CCLASS_OTHER,   /* > */ CCLASS_OTHER,
+ /* ? */ CCLASS_OTHER,    /* @ */ CCLASS_OTHER,   /* A */ CCLASS_VOWEL,
+ /* B */ CCLASS_B,        /* C */ CCLASS_C,       /* D */ CCLASS_D,
+ /* E */ CCLASS_VOWEL,    /* F */ CCLASS_B,       /* G */ CCLASS_C,
+ /* H */ CCLASS_SILENT,   /* I */ CCLASS_VOWEL,   /* J */ CCLASS_C,
+ /* K */ CCLASS_C,        /* L */ CCLASS_L,       /* M */ CCLASS_M,
+ /* N */ CCLASS_M,        /* O */ CCLASS_VOWEL,   /* P */ CCLASS_B,
+ /* Q */ CCLASS_C,        /* R */ CCLASS_R,       /* S */ CCLASS_C,
+ /* T */ CCLASS_D,        /* U */ CCLASS_VOWEL,   /* V */ CCLASS_B,
+ /* W */ CCLASS_SILENT,   /* X */ CCLASS_C,       /* Y */ CCLASS_VOWEL,
+ /* Z */ CCLASS_C,        /* [ */ CCLASS_OTHER,   /* \ */ CCLASS_OTHER,
+ /* ] */ CCLASS_OTHER,    /* ^ */ CCLASS_OTHER,   /* _ */ CCLASS_OTHER,
+ /* ` */ CCLASS_OTHER,    /* a */ CCLASS_VOWEL,   /* b */ CCLASS_B,
+ /* c */ CCLASS_C,        /* d */ CCLASS_D,       /* e */ CCLASS_VOWEL,
+ /* f */ CCLASS_B,        /* g */ CCLASS_C,       /* h */ CCLASS_SILENT,
+ /* i */ CCLASS_VOWEL,    /* j */ CCLASS_C,       /* k */ CCLASS_C,
+ /* l */ CCLASS_L,        /* m */ CCLASS_M,       /* n */ CCLASS_M,
+ /* o */ CCLASS_VOWEL,    /* p */ CCLASS_B,       /* q */ CCLASS_C,
+ /* r */ CCLASS_R,        /* s */ CCLASS_C,       /* t */ CCLASS_D,
+ /* u */ CCLASS_VOWEL,    /* v */ CCLASS_B,       /* w */ CCLASS_SILENT,
+ /* x */ CCLASS_C,        /* y */ CCLASS_VOWEL,   /* z */ CCLASS_C,
+ /* { */ CCLASS_OTHER,    /* | */ CCLASS_OTHER,   /* } */ CCLASS_OTHER,
+ /* ~ */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   
 };
-
 /* 
 ** This tables gives the character class for ASCII characters that form the
 ** initial character of a word.  The only difference from midClass is with
 ** the letters H, W, and Y.
 */
 static const unsigned char initClass[] = {
-          /* x0  x1  x2  x3  x4  x5  x6  x7    x8  x9  xa  xb  xc  xd  xe  xf */
-  /* 0x */   12, 12, 12, 12, 12, 12, 12, 12,   12, 11, 11, 12, 11, 12, 12, 12,
-  /* 1x */   12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-  /* 2x */   11, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-  /* 3x */   10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 12, 12, 12, 12, 12, 12,
-  /* 4x */   12,  1,  2,  3,  4,  1,  2,  3,    5,  1,  3,  3,  6,  7,  7,  1,
-  /* 5x */    2,  3,  6,  3,  4,  1,  2,  8,    3,  9,  3, 12, 12, 12, 12, 12,
-  /* 6x */   12,  1,  2,  3,  4,  1,  2,  3,    5,  1,  3,  3,  6,  7,  7,  1,
-  /* 7x */    2,  3,  6,  3,  4,  1,  2,  8,    3,  9,  3, 12, 12, 12, 12, 12,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_SPACE,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_SPACE,    /*   */ CCLASS_SPACE,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_OTHER,
+ /*   */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   /*   */ CCLASS_SPACE,
+ /* ! */ CCLASS_OTHER,    /* " */ CCLASS_OTHER,   /* # */ CCLASS_OTHER,
+ /* $ */ CCLASS_OTHER,    /* % */ CCLASS_OTHER,   /* & */ CCLASS_OTHER,
+ /* ' */ CCLASS_OTHER,    /* ( */ CCLASS_OTHER,   /* ) */ CCLASS_OTHER,
+ /* * */ CCLASS_OTHER,    /* + */ CCLASS_OTHER,   /* , */ CCLASS_OTHER,
+ /* - */ CCLASS_OTHER,    /* . */ CCLASS_OTHER,   /* / */ CCLASS_OTHER,
+ /* 0 */ CCLASS_DIGIT,    /* 1 */ CCLASS_DIGIT,   /* 2 */ CCLASS_DIGIT,
+ /* 3 */ CCLASS_DIGIT,    /* 4 */ CCLASS_DIGIT,   /* 5 */ CCLASS_DIGIT,
+ /* 6 */ CCLASS_DIGIT,    /* 7 */ CCLASS_DIGIT,   /* 8 */ CCLASS_DIGIT,
+ /* 9 */ CCLASS_DIGIT,    /* : */ CCLASS_OTHER,   /* ; */ CCLASS_OTHER,
+ /* < */ CCLASS_OTHER,    /* = */ CCLASS_OTHER,   /* > */ CCLASS_OTHER,
+ /* ? */ CCLASS_OTHER,    /* @ */ CCLASS_OTHER,   /* A */ CCLASS_VOWEL,
+ /* B */ CCLASS_B,        /* C */ CCLASS_C,       /* D */ CCLASS_D,
+ /* E */ CCLASS_VOWEL,    /* F */ CCLASS_B,       /* G */ CCLASS_C,
+ /* H */ CCLASS_SILENT,   /* I */ CCLASS_VOWEL,   /* J */ CCLASS_C,
+ /* K */ CCLASS_C,        /* L */ CCLASS_L,       /* M */ CCLASS_M,
+ /* N */ CCLASS_M,        /* O */ CCLASS_VOWEL,   /* P */ CCLASS_B,
+ /* Q */ CCLASS_C,        /* R */ CCLASS_R,       /* S */ CCLASS_C,
+ /* T */ CCLASS_D,        /* U */ CCLASS_VOWEL,   /* V */ CCLASS_B,
+ /* W */ CCLASS_W,        /* X */ CCLASS_C,       /* Y */ CCLASS_Y,
+ /* Z */ CCLASS_C,        /* [ */ CCLASS_OTHER,   /* \ */ CCLASS_OTHER,
+ /* ] */ CCLASS_OTHER,    /* ^ */ CCLASS_OTHER,   /* _ */ CCLASS_OTHER,
+ /* ` */ CCLASS_OTHER,    /* a */ CCLASS_VOWEL,   /* b */ CCLASS_B,
+ /* c */ CCLASS_C,        /* d */ CCLASS_D,       /* e */ CCLASS_VOWEL,
+ /* f */ CCLASS_B,        /* g */ CCLASS_C,       /* h */ CCLASS_SILENT,
+ /* i */ CCLASS_VOWEL,    /* j */ CCLASS_C,       /* k */ CCLASS_C,
+ /* l */ CCLASS_L,        /* m */ CCLASS_M,       /* n */ CCLASS_M,
+ /* o */ CCLASS_VOWEL,    /* p */ CCLASS_B,       /* q */ CCLASS_C,
+ /* r */ CCLASS_R,        /* s */ CCLASS_C,       /* t */ CCLASS_D,
+ /* u */ CCLASS_VOWEL,    /* v */ CCLASS_B,       /* w */ CCLASS_W,
+ /* x */ CCLASS_C,        /* y */ CCLASS_Y,       /* z */ CCLASS_C,
+ /* { */ CCLASS_OTHER,    /* | */ CCLASS_OTHER,   /* } */ CCLASS_OTHER,
+ /* ~ */ CCLASS_OTHER,    /*   */ CCLASS_OTHER,   
 };
 
 /*
-** Mapping from the character class number (0-12) to a symbol for each
+** Mapping from the character class number (0-13) to a symbol for each
 ** character class.  Note that initClass[] can be used to map the class
 ** symbol back into the class number.
 */
-static const unsigned char className[] = ".ABCDHLMWY9 ?";
+static const unsigned char className[] = ".ABCDHLRMWY9 ?";
 
 /*
-** Generate a string of character classes corresponding to the
-** ASCII characters in the input string zIn.  If the input is not
-** ASCII then the behavior is undefined.
+** Generate a "phonetic hash" from a string of ASCII characters
+** in zIn[0..nIn-1].
+**
+**   * Map characters by character class as defined above.
+**   * Omit double-letters
+**   * Omit vowels beside R and L
+**   * Omit T when followed by CH
+**   * Omit W when followed by R
+**   * Omit D when followed by J or G
+**   * Omit K in KN or G in GN at the beginning of a word
 **
 ** Space to hold the result is obtained from sqlite3_malloc()
 **
 ** Return NULL if memory allocation fails.  
 */
-static unsigned char *characterClassString(const unsigned char *zIn, int nIn){
+static unsigned char *phoneticHash(const unsigned char *zIn, int nIn){
   unsigned char *zOut = sqlite3_malloc( nIn + 1 );
   int i;
   int nOut = 0;
   char cPrev = 0x77;
+  char cPrevX = 0x77;
   const unsigned char *aClass = initClass;
 
   if( zOut==0 ) return 0;
+  if( nIn>2 ){
+    switch( zIn[0] ){
+      case 'g': 
+      case 'k': {
+        if( zIn[1]=='n' ){ zIn++; nIn--; }
+        break;
+      }
+    }
+  }
+  if( zIn[0]=='k' && zIn[1]=='n' ){ zIn++, nIn--; }
   for(i=0; i<nIn; i++){
     unsigned char c = zIn[i];
+    if( i+1<nIn ){
+      if( c=='w' && zIn[i+1]=='r' ) continue;
+      if( c=='d' && (zIn[i+1]=='j' || zIn[i+1]=='g') ) continue;
+      if( i+2<nIn ){
+        if( c=='t' && zIn[i+1]=='c' && zIn[i+2]=='h' ) continue;
+      }
+    }
     c = aClass[c&0x7f];
+    if( c==CCLASS_SPACE ) continue;
     if( c==CCLASS_OTHER && cPrev!=CCLASS_DIGIT ) continue;
+    if( c==CCLASS_VOWEL && (cPrevX==CCLASS_R || cPrevX==CCLASS_L) ){
+       continue; /* No vowels beside L or R */ 
+    }
+    if( (c==CCLASS_R || c==CCLASS_L) && cPrevX==CCLASS_VOWEL ){
+       nOut--;   /* No vowels beside L or R */
+    }
     cPrev = c;
     if( c==CCLASS_SILENT ) continue;
+    cPrevX = c;
     if( c==CCLASS_SPACE ) continue;
     aClass = midClass;
     c = className[c];
@@ -390,10 +493,10 @@ static unsigned char *characterClassString(const unsigned char *zIn, int nIn){
 }
 
 /*
-** This is an SQL function wrapper around characterClassString().  See
-** the description of characterClassString() for additional information.
+** This is an SQL function wrapper around phoneticHash().  See
+** the description of phoneticHash() for additional information.
 */
-static void characterClassSqlFunc(
+static void phoneticHashSqlFunc(
   sqlite3_context *context,
   int argc,
   sqlite3_value **argv
@@ -403,7 +506,7 @@ static void characterClassSqlFunc(
 
   zIn = sqlite3_value_text(argv[0]);
   if( zIn==0 ) return;
-  zOut = characterClassString(zIn, sqlite3_value_bytes(argv[0]));
+  zOut = phoneticHash(zIn, sqlite3_value_bytes(argv[0]));
   if( zOut==0 ){
     sqlite3_result_error_nomem(context);
   }else{
@@ -424,7 +527,7 @@ static char characterClass(char cPrev, char c){
 ** following character cPrev.  If cPrev==0, that means c is the first
 ** character of the word.
 */
-static int insertOrDeleteCost(char cPrev, char c){
+static int insertOrDeleteCost(char cPrev, char c, char cNext){
   char classC = characterClass(cPrev, c);
   char classCprev;
 
@@ -436,6 +539,9 @@ static int insertOrDeleteCost(char cPrev, char c){
     /* Repeated characters, or miss a repeat */
     return 10;
   }
+  if( classC==CCLASS_VOWEL && (cPrev=='r' || cNext=='r') ){
+    return 20;  /* Insert a vowel before or after 'r' */
+  }
   classCprev = characterClass(cPrev, cPrev);
   if( classC==classCprev ){
     if( classC==CCLASS_VOWEL ){
@@ -500,11 +606,12 @@ static int substituteCost(char cPrev, char cFrom, char cTo){
 **    -2  Non-ASCII characters on input
 **    -3  Unable to allocate memory 
 */
-static int editdist(const char *zA, const char *zB){
+static int editdist1(const char *zA, const char *zB, int iLangId){
   int nA, nB;            /* Number of characters in zA[] and zB[] */
   int xA, xB;            /* Loop counters for zA[] and zB[] */
   char cA, cB;           /* Current character of zA and zB */
   char cAprev, cBprev;   /* Previous character of zA and zB */
+  char cAnext, cBnext;   /* Next character in zA and zB */
   int d;                 /* North-west cost value */
   int dc = 0;            /* North-west character value */
   int res;               /* Final result */
@@ -536,7 +643,7 @@ static int editdist(const char *zA, const char *zB){
   if( nA==0 ){
     cBprev = dc;
     for(xB=res=0; (cB = zB[xB])!=0; xB++){
-      res += insertOrDeleteCost(cBprev, cB)/FINAL_INS_COST_DIV;
+      res += insertOrDeleteCost(cBprev, cB, zB[xB+1])/FINAL_INS_COST_DIV;
       cBprev = cB;
     }
     return res;
@@ -544,7 +651,7 @@ static int editdist(const char *zA, const char *zB){
   if( nB==0 ){
     cAprev = dc;
     for(xA=res=0; (cA = zA[xA])!=0; xA++){
-      res += insertOrDeleteCost(cAprev, cA);
+      res += insertOrDeleteCost(cAprev, cA, zA[xA+1]);
       cAprev = cA;
     }
     return res;
@@ -567,30 +674,33 @@ static int editdist(const char *zA, const char *zB){
   cx[0] = dc;
   cBprev = dc;
   for(xB=1; xB<=nB; xB++){
+    cBnext = zB[xB];
     cB = zB[xB-1];
     cx[xB] = cB;
-    m[xB] = m[xB-1] + insertOrDeleteCost(cBprev, cB);
+    m[xB] = m[xB-1] + insertOrDeleteCost(cBprev, cB, cBnext);
     cBprev = cB;
   }
   cAprev = dc;
   for(xA=1; xA<=nA; xA++){
     int lastA = (xA==nA);
     cA = zA[xA-1];
+    cAnext = zA[xA];
     if( cA=='*' && lastA ) break;
     d = m[0];
     dc = cx[0];
-    m[0] = d + insertOrDeleteCost(cAprev, cA);
+    m[0] = d + insertOrDeleteCost(cAprev, cA, cAnext);
     cBprev = 0;
     for(xB=1; xB<=nB; xB++){
       int totalCost, insCost, delCost, subCost, ncx;
       cB = zB[xB-1];
+      cBnext = zB[xB];
 
       /* Cost to insert cB */
-      insCost = insertOrDeleteCost(cx[xB-1], cB);
+      insCost = insertOrDeleteCost(cx[xB-1], cB, cBnext);
       if( lastA ) insCost /= FINAL_INS_COST_DIV;
 
       /* Cost to delete cA */
-      delCost = insertOrDeleteCost(cx[xB], cA);
+      delCost = insertOrDeleteCost(cx[xB], cA, cBnext);
 
       /* Cost to substitute cA->cB */
       subCost = substituteCost(cx[xB-1], cA, cB);
@@ -624,9 +734,9 @@ static int editdist(const char *zA, const char *zB){
   }
 
   /* Free the wagner matrix and return the result */
-  if( cA=='*' && nB>nA ){
-    res = m[nA];
-    for(xB=nA+1; xB<=nB; xB++){
+  if( cA=='*' ){
+    res = m[1];
+    for(xB=1; xB<=nB; xB++){
       if( m[xB]<res ) res = m[xB];
     }
   }else{
@@ -638,6 +748,7 @@ static int editdist(const char *zA, const char *zB){
 
 /*
 ** Function:    editdist(A,B)
+**              editdist(A,B,langid)
 **
 ** Return the cost of transforming string A into string B.  Both strings
 ** must be pure ASCII text.  If A ends with '*' then it is assumed to be
@@ -649,8 +760,11 @@ static void editdistSqlFunc(
   int argc,
   sqlite3_value **argv
 ){
-  int res = editdist((const char*)sqlite3_value_text(argv[0]),
-                    (const char*)sqlite3_value_text(argv[1]));
+  int langid = argc==2 ? 0 : sqlite3_value_int(argv[2]);
+  int res = editdist1(
+                    (const char*)sqlite3_value_text(argv[0]),
+                    (const char*)sqlite3_value_text(argv[1]),
+                    langid);
   if( res<0 ){
     if( res==(-3) ){
       sqlite3_result_error_nomem(context);
@@ -664,7 +778,608 @@ static void editdistSqlFunc(
   }
 }
 
-#if !SQLITE_CORE
+/* End of the fixed-cost edit distance implementation
+******************************************************************************
+*****************************************************************************
+** Begin: Configurable cost unicode edit distance routines
+*/
+/* Forward declaration of structures */
+typedef struct EditDist3Cost EditDist3Cost;
+typedef struct EditDist3Config EditDist3Config;
+typedef struct EditDist3Point EditDist3Point;
+typedef struct EditDist3From EditDist3From;
+typedef struct EditDist3FromString EditDist3FromString;
+typedef struct EditDist3To EditDist3To;
+typedef struct EditDist3ToString EditDist3ToString;
+typedef struct EditDist3Lang EditDist3Lang;
+
+
+/*
+** An entry in the edit cost table
+*/
+struct EditDist3Cost {
+  EditDist3Cost *pNext;     /* Next cost element */
+  u8 nFrom;                 /* Number of bytes in aFrom */
+  u8 nTo;                   /* Number of bytes in aTo */
+  u16 iCost;                /* Cost of this transformation */
+  char a[4]    ;            /* FROM string followed by TO string */
+  /* Additional TO and FROM string bytes appended as necessary */
+};
+
+/*
+** Edit costs for a particular language ID 
+*/
+struct EditDist3Lang {
+  int iLang;             /* Language ID */
+  int iInsCost;          /* Default insertion cost */
+  int iDelCost;          /* Default deletion cost */
+  int iSubCost;          /* Default substitution cost */
+  EditDist3Cost *pCost;  /* Costs */
+};
+
+
+/*
+** The default EditDist3Lang object, with default costs.
+*/
+static const EditDist3Lang editDist3Lang = { 0, 100, 100, 150, 0 };
+
+/*
+** Complete configuration
+*/
+struct EditDist3Config {
+  int nLang;             /* Number of language IDs.  Size of a[] */
+  EditDist3Lang *a;      /* One for each distinct language ID */
+};
+
+/*
+** Extra information about each character in the FROM string.
+*/
+struct EditDist3From {
+  int nSubst;              /* Number of substitution cost entries */
+  int nDel;                /* Number of deletion cost entries */
+  int nByte;               /* Number of bytes in this character */
+  EditDist3Cost **apSubst; /* Array of substitution costs for this element */
+  EditDist3Cost **apDel;   /* Array of deletion cost entries */
+};
+
+/*
+** A precompiled FROM string.
+*
+** In the common case we expect the FROM string to be reused multiple times.
+** In other words, the common case will be to measure the edit distance
+** from a single origin string to multiple target strings.
+*/
+struct EditDist3FromString {
+  char *z;                 /* The complete text of the FROM string */
+  int n;                   /* Number of characters in the FROM string */
+  int isPrefix;            /* True if ends with '*' character */
+  EditDist3From *a;        /* Extra info about each char of the FROM string */
+};
+
+/*
+** Extra information about each character in the TO string.
+*/
+struct EditDist3To {
+  int nIns;                /* Number of insertion cost entries */
+  int nByte;               /* Number of bytes in this character */
+  EditDist3Cost **apIns;   /* Array of deletion cost entries */
+};
+
+/*
+** A precompiled FROM string
+*/
+struct EditDist3ToString {
+  char *z;                 /* The complete text of the TO string */
+  int n;                   /* Number of characters in the TO string */
+  EditDist3To *a;          /* Extra info about each char of the TO string */
+};
+
+/*
+** Clear or delete an instance of the object that records all edit-distance
+** weights.
+*/
+static void editDist3ConfigClear(EditDist3Config *p){
+  int i;
+  if( p==0 ) return;
+  for(i=0; i<p->nLang; i++){
+    EditDist3Cost *pCost, *pNext;
+    pCost = p->a[i].pCost;
+    while( pCost ){
+      pNext = pCost->pNext;
+      sqlite3_free(pCost);
+      pCost = pNext;
+    }
+  }
+  sqlite3_free(p->a);
+  memset(p, 0, sizeof(*p));
+}
+static void editDist3ConfigDelete(void *pIn){
+  EditDist3Config *p = (EditDist3Config*)pIn;
+  editDist3ConfigClear(p);
+  sqlite3_free(p);
+}
+
+/*
+** Load all edit-distance weights from a table.
+*/
+static int editDist3ConfigLoad(
+  EditDist3Config *p,      /* The edit distance configuration to load */
+  sqlite3 *db,            /* Load from this database */
+  const char *zTable      /* Name of the table from which to load */
+){
+  sqlite3_stmt *pStmt;
+  int rc;
+  char *zSql;
+  int iLangPrev = -9999;
+  EditDist3Lang *pLang;
+
+  zSql = sqlite3_mprintf("SELECT iLang, cFrom, cTo, iCost"
+                         " FROM \"%w\" WHERE iLang>=0 ORDER BY iLang", zTable);
+  if( zSql==0 ) return SQLITE_NOMEM;
+  rc = sqlite3_prepare(db, zSql, -1, &pStmt, 0);
+  sqlite3_free(zSql);
+  if( rc ) return rc;
+  editDist3ConfigClear(p);
+  while( sqlite3_step(pStmt)==SQLITE_ROW ){
+    int iLang = sqlite3_column_int(pStmt, 0);
+    const char *zFrom = (const char*)sqlite3_column_text(pStmt, 1);
+    int nFrom = sqlite3_column_bytes(pStmt, 1);
+    const char *zTo = (const char*)sqlite3_column_text(pStmt, 2);
+    int nTo = sqlite3_column_bytes(pStmt, 2);
+    int iCost = sqlite3_column_int(pStmt, 3);
+
+    if( nFrom>100 || nFrom<0 || nTo>100 || nTo<0 ) continue;
+    if( iCost<0 ) continue;
+    if( iLang!=iLangPrev ){
+      EditDist3Lang *pNew;
+      p->nLang++;
+      pNew = sqlite3_realloc(p->a, p->nLang*sizeof(p->a[0]));
+      if( pNew==0 ){ rc = SQLITE_NOMEM; break; }
+      p->a = pNew;
+      pLang = &p->a[p->nLang-1];
+      pLang->iLang = iLang;
+      pLang->iInsCost = 100;
+      pLang->iDelCost = 100;
+      pLang->iSubCost = 200;
+      pLang->pCost = 0;
+      iLangPrev = iLang;
+    }
+    if( nFrom==1 && zFrom[0]=='?' && nTo==0 ){
+      pLang->iDelCost = iCost;
+    }else if( nFrom==0 && nTo==1 && zTo[0]=='?' ){
+      pLang->iInsCost = iCost;
+    }else if( nFrom==1 && nTo==1 && zFrom[0]=='?' && zTo[0]=='?' ){
+      pLang->iSubCost = iCost;
+    }else{
+      EditDist3Cost *pCost;
+      int nExtra = nFrom + nTo - 4;
+      if( nExtra<0 ) nExtra = 0;
+      pCost = sqlite3_malloc( sizeof(*pCost) + nExtra );
+      if( pCost==0 ){ rc = SQLITE_NOMEM; break; }
+      pCost->nFrom = nFrom;
+      pCost->nTo = nTo;
+      pCost->iCost = iCost;
+      memcpy(pCost->a, zFrom, nFrom);
+      memcpy(pCost->a + nFrom, zTo, nTo);
+      pCost->pNext = pLang->pCost;
+      pLang->pCost = pCost; 
+    }
+  }
+  sqlite3_finalize(pStmt);
+  return rc;
+}
+
+/*
+** Return the length (in bytes) of a utf-8 character.  Or return a maximum
+** of N.
+*/
+static int utf8Len(unsigned char c, int N){
+  int len = 1;
+  if( c>0x7f ){
+    if( (c&0xe0)==0xc0 ){
+      len = 2;
+    }else if( (c&0xf0)==0xe0 ){
+      len = 3;
+    }else{
+      len = 4;
+    }
+  }
+  if( len>N ) len = N;
+  return len;
+}
+
+/*
+** Return TRUE (non-zero) of the To side of the given cost matches
+** the given string.
+*/
+static int matchTo(EditDist3Cost *p, const char *z, int n){
+  if( p->nTo>n ) return 0;
+  if( memcmp(p->a+p->nFrom, z, p->nTo)!=0 ) return 0;
+  return 1;
+}
+
+/*
+** Return TRUE (non-zero) of the To side of the given cost matches
+** the given string.
+*/
+static int matchFrom(EditDist3Cost *p, const char *z, int n){
+  if( p->nFrom>n ) return 0;
+  if( memcmp(p->a, z, p->nFrom)!=0 ) return 0;
+  return 1;
+}
+
+/*
+** Return TRUE (non-zero) of the next FROM character and the next TO
+** character are the same.
+*/
+static int matchFromTo(
+  EditDist3FromString *pStr,  /* Left hand string */
+  int n1,                     /* Index of comparison character on the left */
+  const char *z2,             /* Right-handl comparison character */
+  int n2                      /* Bytes remaining in z2[] */
+){
+  int b1 = pStr->a[n1].nByte;
+  if( b1>n2 ) return 0;
+  if( memcmp(pStr->z+n1, z2, b1)!=0 ) return 0;
+  return 1;
+}
+
+/*
+** Delete an EditDist3FromString objecct
+*/
+static void editDist3FromStringDelete(EditDist3FromString *p){
+  int i;
+  if( p ){
+    for(i=0; i<p->n; i++){
+      sqlite3_free(p->a[i].apDel);
+      sqlite3_free(p->a[i].apSubst);
+    }
+    sqlite3_free(p);
+  }
+}
+
+/*
+** Create a EditDist3FromString object.
+*/
+static EditDist3FromString *editDist3FromStringNew(
+  const EditDist3Lang *pLang,
+  const char *z,
+  int n
+){
+  EditDist3FromString *pStr;
+  EditDist3Cost *p;
+  int i;
+
+  if( n<0 ) n = (int)strlen(z);
+  pStr = sqlite3_malloc( sizeof(*pStr) + sizeof(pStr->a[0])*n + n + 1 );
+  if( pStr==0 ) return 0;
+  pStr->a = (EditDist3From*)&pStr[1];
+  pStr->n = n;
+  pStr->z = (char*)&pStr->a[n];
+  memcpy(pStr->z, z, n+1);
+  if( n && z[n-1]=='*' ){
+    pStr->isPrefix = 1;
+    n--;
+    pStr->n--;
+    pStr->z[n] = 0;
+  }else{
+    pStr->isPrefix = 0;
+  }
+
+  for(i=0; i<n; i++){
+    EditDist3From *pFrom = &pStr->a[i];
+    memset(pFrom, 0, sizeof(*pFrom));
+    pFrom->nByte = utf8Len((unsigned char)z[i], n-i);
+    for(p=pLang->pCost; p; p=p->pNext){
+      EditDist3Cost **apNew;
+      if( i+p->nFrom>n ) continue;
+      if( matchFrom(p, z+i, n-i)==0 ) continue;
+      if( p->nTo==0 ){
+        apNew = sqlite3_realloc(pFrom->apDel,
+                                sizeof(*apNew)*(pFrom->nDel+1));
+        if( apNew==0 ) break;
+        pFrom->apDel = apNew;
+        apNew[pFrom->nDel++] = p;
+      }else{
+        apNew = sqlite3_realloc(pFrom->apSubst,
+                                sizeof(*apNew)*(pFrom->nSubst+1));
+        if( apNew==0 ) break;
+        pFrom->apSubst = apNew;
+        apNew[pFrom->nSubst++] = p;
+      }
+    }
+    if( p ){
+      editDist3FromStringDelete(pStr);
+      pStr = 0;
+      break;
+    }
+  }
+  return pStr;
+}
+
+/*
+** Return the number of bytes in the common prefix of two UTF8 strings.
+** Only complete characters are considered.
+*/
+static int editDist3PrefixLen(const char *z1, const char *z2){
+  int n = 0;
+  while( z1[n] && z1[n]==z2[n] ){ n++; }
+  while( n && (z1[n]&0xc0)==0x80 ){ n--; }
+  return n;
+}
+
+/*
+** Return the number of bytes in the common suffix of two UTF8 strings.
+** Only complete characters are considered.
+*/
+static int editDist3SuffixLen(const char *z1, int n1, const char *z2, int n2){
+  int origN1 = n1;
+  while( n1>0 && n2>0 && z1[n1-1]==z2[n2-1] ){ n1--; n2--; }
+  while( n1<origN1 && (z1[n1]&0xc0)==0x80 ){ n1++; n2++; }
+  return origN1 - n1;
+}
+
+/*
+** Update entry m[i] such that it is the minimum of its current value
+** and m[j]+iCost.
+**
+** If the iCost is 1,000,000 or greater, then consider the cost to be
+** infinite and skip the update.
+*/
+static void updateCost(
+  unsigned int *m,
+  int i,
+  int j,
+  int iCost
+){
+  int b;
+  if( iCost<10000 ){
+    b = m[j] + iCost;
+    if( b<m[i] ) m[i] = b;
+  }
+}
+
+/* Compute the edit distance between two strings.
+**
+** If an error occurs, return a negative number which is the error code.
+*/
+static int editDist3Core(
+  EditDist3FromString *pFrom,  /* The FROM string */
+  const char *z2,              /* The TO string */
+  int n2,                      /* Length of the TO string */
+  const EditDist3Lang *pLang   /* Edit weights for a particular language ID */
+){
+  int k, n;
+  int i1, b1;
+  int i2, b2;
+  EditDist3FromString f = *pFrom;
+  EditDist3To *a2;
+  unsigned int *m;
+  int szRow;
+  EditDist3Cost *p;
+  int res;
+
+#if 0
+  /* Remove comment prefix and suffix */
+  n = editDist3PrefixLen(f.z, z2);
+  if( f.n==n2 && n2==n ) return 0;  /* Identical strings */
+  f.n -= n;
+  f.z += n;
+  f.a += n;
+  n2 -= n;
+  z2 += n;
+  if( f.isPrefix==0 ){
+    n = editDist3SuffixLen(f.z, f.n, z2, n2);
+    f.n -= n;
+    n2 -= n;
+  }
+#endif
+
+  /* allocate the Wagner matrix and the aTo[] array for the TO string */
+  n = (f.n+1)*(n2+1);
+  n = (n+1)&~1;
+  m = sqlite3_malloc( n*sizeof(m[0]) + sizeof(a2[0])*n2 );
+  if( m==0 ) return -1;            /* Out of memory */
+  a2 = (EditDist3To*)&m[n];
+  memset(a2, 0, sizeof(a2[0])*n2);
+
+  /* Fill in the a1[] matrix for all characters of the TO string */
+  for(i2=0; i2<n2; i2++){
+    a2[i2].nByte = utf8Len((unsigned char)z2[i2], n2-i2);
+    for(p=pLang->pCost; p; p=p->pNext){
+      EditDist3Cost **apNew;
+      if( p->nFrom>0 ) continue;
+      if( i2+p->nTo>n2 ) continue;
+      if( matchTo(p, z2+i2, n2-i2)==0 ) continue;
+      a2[i2].nIns++;
+      apNew = sqlite3_realloc(a2[i2].apIns, sizeof(*apNew)*a2[i2].nIns);
+      if( apNew==0 ){
+        res = -1;  /* Out of memory */
+        goto editDist3Abort;
+      }
+      a2[i2].apIns = apNew;
+      a2[i2].apIns[a2[i2].nIns-1] = p;
+    }
+  }
+
+  /* Prepare to compute the minimum edit distance */
+  szRow = f.n+1;
+  memset(m, 0x01, (n2+1)*szRow*sizeof(m[0]));
+  m[0] = 0;
+
+  /* First fill in the top-row of the matrix with FROM deletion costs */
+  for(i1=0; i1<f.n; i1 += b1){
+    b1 = f.a[i1].nByte;
+    updateCost(m, i1+b1, i1, pLang->iDelCost);
+    for(k=0; k<f.a[i1].nDel; k++){
+      p = f.a[i1].apDel[k];
+      updateCost(m, i1+p->nFrom, i1, p->iCost);
+    }
+  }
+
+  /* Fill in all subsequent rows, top-to-bottom, left-to-right */
+  for(i2=0; i2<n2; i2 += b2){
+    int rx;      /* Starting index for current row */
+    int rxp;     /* Starting index for previous row */
+    b2 = a2[i2].nByte;
+    rx = szRow*(i2+b2);
+    rxp = szRow*i2;
+    updateCost(m, rx, rxp, pLang->iInsCost);
+    for(k=0; k<a2[i2].nIns; k++){
+      p = a2[i2].apIns[k];
+      updateCost(m, szRow*(i2+p->nTo), rxp, p->iCost);
+    }
+    for(i1=0; i1<f.n; i1+=b1){
+      int cx;    /* Index of current cell */
+      int cxp;   /* Index of cell immediately to the left */
+      int cxd;   /* Index of cell to the left and one row above */
+      int cxu;   /* Index of cell immediately above */
+      b1 = f.a[i1].nByte;
+      cxp = rx + i1;
+      cx = cxp + b1;
+      cxd = rxp + i1;
+      cxu = cxd + b1;
+      updateCost(m, cx, cxp, pLang->iDelCost);
+      for(k=0; k<f.a[i1].nDel; k++){
+        p = f.a[i1].apDel[k];
+        updateCost(m, cxp+p->nFrom, cxp, p->iCost);
+      }
+      updateCost(m, cx, cxu, pLang->iInsCost);
+      if( matchFromTo(&f, i1, z2+i2, n2-i2) ){
+        updateCost(m, cx, cxd, 0);
+      }
+      updateCost(m, cx, cxd, pLang->iSubCost);
+      for(k=0; k<f.a[i1].nSubst; k++){
+        p = f.a[i1].apSubst[k];
+        if( matchTo(p, z2+i2, n2-i2) ){
+          updateCost(m, cxd+p->nFrom+szRow*p->nTo, cxd, p->iCost);
+        }
+      }
+    }
+  }
+
+#if 0
+  printf("         ^");
+  for(i1=0; i1<f.n; i1++) printf(" %c-%2x", f.z[i1], f.z[i1]&0xff);
+  printf("\n   ^:");
+  for(i1=0; i1<szRow; i1++){
+    int v = m[i1];
+    if( v>9999 ) printf(" ****");
+    else         printf(" %4d", v);
+  }
+  printf("\n");
+  for(i2=0; i2<n2; i2++){
+    printf("%c-%02x:", z2[i2], z2[i2]&0xff);
+    for(i1=0; i1<szRow; i1++){
+      int v = m[(i2+1)*szRow+i1];
+      if( v>9999 ) printf(" ****");
+      else         printf(" %4d", v);
+    }
+    printf("\n");
+  }
+#endif
+
+  /* Free memory allocations and return the result */
+  res = (int)m[szRow*(n2+1)-1];
+  if( f.isPrefix ){
+    for(i2=f.n; i2<n2; i2++){
+      int b = m[szRow*i2-1];
+      if( b<res ) res = b;
+    }
+  }
+
+editDist3Abort:
+  for(i2=0; i2<n2; i2++) sqlite3_free(a2[i2].apIns);
+  sqlite3_free(m);
+  return res;
+}
+
+/*
+** Get an appropriate EditDist3Lang object.
+*/
+static const EditDist3Lang *editDist3FindLang(
+  EditDist3Config *pConfig,
+  int iLang
+){
+  int i;
+  for(i=0; i<pConfig->nLang; i++){
+    if( pConfig->a[i].iLang==iLang ) return &pConfig->a[i];
+  }
+  return &editDist3Lang;
+}
+
+/*
+** Function:    editdist3(A,B,iLang)
+**              editdist3(tablename)
+**
+** Return the cost of transforming string A into string B using edit
+** weights for iLang.
+**
+** The second form loads edit weights into memory from a table.
+*/
+static void editDist3SqlFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  EditDist3Config *pConfig = (EditDist3Config*)sqlite3_user_data(context);
+  sqlite3 *db = sqlite3_context_db_handle(context);
+  int rc;
+  if( argc==1 ){
+    const char *zTable = (const char*)sqlite3_value_text(argv[0]);
+    rc = editDist3ConfigLoad(pConfig, db, zTable);
+    if( rc ) sqlite3_result_error_code(context, rc);
+  }else{
+    const char *zA = (const char*)sqlite3_value_text(argv[0]);
+    const char *zB = (const char*)sqlite3_value_text(argv[1]);
+    int nA = sqlite3_value_bytes(argv[0]);
+    int nB = sqlite3_value_bytes(argv[1]);
+    int iLang = argc==3 ? sqlite3_value_int(argv[2]) : 0;
+    const EditDist3Lang *pLang = editDist3FindLang(pConfig, iLang);
+    EditDist3FromString *pFrom;
+    int dist;
+
+    pFrom = editDist3FromStringNew(pLang, zA, nA);
+    if( pFrom==0 ){
+      sqlite3_result_error_nomem(context);
+      return;
+    }
+    dist = editDist3Core(pFrom, zB, nB, pLang);
+    editDist3FromStringDelete(pFrom);
+    sqlite3_result_int(context, dist);
+  } 
+}
+
+/*
+** Register the editDist3 function with SQLite
+*/
+static int editDist3Install(sqlite3 *db){
+  int rc;
+  EditDist3Config *pConfig = sqlite3_malloc( sizeof(*pConfig) );
+  if( pConfig==0 ) return SQLITE_NOMEM;
+  memset(pConfig, 0, sizeof(*pConfig));
+  rc = sqlite3_create_function_v2(db, "editdist3",
+              2, SQLITE_UTF8, pConfig, editDist3SqlFunc, 0, 0, 0);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function_v2(db, "editdist3",
+                3, SQLITE_UTF8, pConfig, editDist3SqlFunc, 0, 0, 0);
+  }
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function_v2(db, "editdist3",
+                1, SQLITE_UTF8, pConfig, editDist3SqlFunc, 0, 0,
+                editDist3ConfigDelete);
+  }else{
+    sqlite3_free(pConfig);
+  }
+  return rc;
+}
+/* End configurable cost unicode edit distance routines
+******************************************************************************
+******************************************************************************
+** Begin transliterate unicode-to-ascii implementation
+*/
+
+#if !SQLITE_AMALGAMATION
 /*
 ** This lookup table is used to help decode the first byte of
 ** a multi-byte UTF8 character.
@@ -1018,7 +1733,9 @@ static const struct {
   { 0x0427,  0x43, 0x68 },  /* Ч to Ch */
   { 0x0428,  0x53, 0x68 },  /* Ш to Sh */
   { 0x0429,  0x53, 0x68 },  /* Щ to Shch */
+  { 0x042A,  0x61, 0x00 },  /*  to A */
   { 0x042B,  0x59, 0x00 },  /* Ы to Y */
+  { 0x042C,  0x59, 0x00 },  /*  to Y */
   { 0x042D,  0x45, 0x00 },  /* Э to E */
   { 0x042E,  0x49, 0x75 },  /* Ю to Iu */
   { 0x042F,  0x49, 0x61 },  /* Я to Ia */
@@ -1048,7 +1765,9 @@ static const struct {
   { 0x0447,  0x63, 0x68 },  /* ч to ch */
   { 0x0448,  0x73, 0x68 },  /* ш to sh */
   { 0x0449,  0x73, 0x68 },  /* щ to shch */
+  { 0x044A,  0x61, 0x00 },  /*  to a */
   { 0x044B,  0x79, 0x00 },  /* ы to y */
+  { 0x044C,  0x79, 0x00 },  /*  to y */
   { 0x044D,  0x65, 0x00 },  /* э to e */
   { 0x044E,  0x69, 0x75 },  /* ю to iu */
   { 0x044F,  0x69, 0x61 },  /* я to ia */
@@ -1222,25 +1941,157 @@ static void scriptCodeSqlFunc(
   sqlite3_result_int(context, res);
 }
 
-/*****************************************************************************
-** Fuzzy-search virtual table
-*****************************************************************************/
+/* End transliterate
+******************************************************************************
+******************************************************************************
+** Begin Polloc & Zamora SPEEDCOP style keying functions.
+*/
+/*
+** The Pollock & Zamora skeleton function.  Move all consonants to the
+** front and all vowels to the end, removing duplicates.  Except if the
+** first letter is a vowel then it remains as the first letter.
+*/
+static void pollockSkeletonKey(const char *zIn, char *zOut){
+  int i, j;
+  unsigned char c;
+  char seen[26];
+  static const unsigned char isVowel[] = { 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0,
+    0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 };
+  memset(seen, 0, sizeof(seen));
+  for(i=j=0; (c = (unsigned char)zIn[i])!=0; i++){
+    if( c<'a' || c>'z' ) continue;
+    if( j>0 || isVowel[c-'a'] ) continue;
+    if( seen[c-'a'] ) continue;
+    seen[c-'a'] = 1;
+    zOut[j++] = c;
+  }
+  for(i=0; (c = (unsigned char)zIn[i])!=0; i++){
+    if( c<'a' || c>'z' ) continue;
+    if( seen[c-'a'] ) continue;
+    if( !isVowel[c-'a'] ) continue;
+    seen[c-'a'] = 1;
+    zOut[j++] = c;
+  }
+  zOut[j] = 0;
+}
+
+/*
+** Function:    pollock_skeleton(X)
+**
+** Return the Pollock and Zamora skeleton key for a string X of all
+** lower-case letters.
+*/
+static void pollockSkeletonSqlFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const char *zIn = (const char*)sqlite3_value_text(argv[0]);
+  int nIn = sqlite3_value_bytes(argv[0]);
+  char *zOut;
+  if( zIn ){
+    zOut = sqlite3_malloc( nIn + 1 );
+    if( zOut==0 ){
+      sqlite3_result_error_nomem(context);
+    }else{
+      pollockSkeletonKey(zIn, zOut);
+      sqlite3_result_text(context, (char*)zOut, -1, sqlite3_free);
+    }
+  }
+}  
+
+/*
+** The Pollock & Zamora omission key.
+**
+** The key consists of unique consonants in the following order:
+**
+**         jkqxzvwybfmgpdhclntsr
+**
+** These are followed by unique vowels in input order.
+*/
+static void pollockOmissionKey(const char *zIn, char *zOut){
+  int i, j;
+  unsigned char c;
+  char seen[26];
+  static const unsigned char isVowel[] = { 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0,
+    0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 };
+  static const unsigned char constOrder[] = "jkqxzvwybfmgpdhclntsr";
+
+  memset(seen, 0, sizeof(seen));
+  for(i=j=0; (c = (unsigned char)zIn[i])!=0; i++){
+    if( c<'a' || c>'z' ) continue;
+    if( isVowel[c-'a'] ) continue;
+    if( seen[c-'a'] ) continue;
+    seen[c-'a'] = 1;
+  }
+  for(i=0; (c = constOrder[i])!=0; i++){
+    if( seen[c-'a'] ) zOut[j++] = c;
+  }
+  for(i=0; (c = (unsigned char)zIn[i])!=0; i++){
+    if( c<'a' || c>'z' ) continue;
+    if( seen[c-'a'] ) continue;
+    if( !isVowel[c-'a'] ) continue;
+    seen[c-'a'] = 1;
+    zOut[j++] = c;
+  }
+  zOut[j] = 0;
+}
+
+/*
+** Function:    pollock_omission(X)
+**
+** Return the Pollock and Zamora omission key for a string X of all
+** lower-case letters.
+*/
+static void pollockOmissionSqlFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const char *zIn = (const char*)sqlite3_value_text(argv[0]);
+  int nIn = sqlite3_value_bytes(argv[0]);
+  char *zOut;
+  if( zIn ){
+    zOut = sqlite3_malloc( nIn + 1 );
+    if( zOut==0 ){
+      sqlite3_result_error_nomem(context);
+    }else{
+      pollockOmissionKey(zIn, zOut);
+      sqlite3_result_text(context, (char*)zOut, -1, sqlite3_free);
+    }
+  }
+}  
+
+
+/* End SPEEDCOP keying functions
+******************************************************************************
+******************************************************************************
+** Begin spellfix1 virtual table.
+*/
+
+/* Maximum length of a phonehash used for querying the shadow table */
+#define SPELLFIX_MX_HASH  8
+
+/* Maximum number of hash strings to examine per query */
+#define SPELLFIX_MX_RUN   8
 
 typedef struct spellfix1_vtab spellfix1_vtab;
 typedef struct spellfix1_cursor spellfix1_cursor;
 
 /* Fuzzy-search virtual table object */
 struct spellfix1_vtab {
-  sqlite3_vtab base;      /* Base class - must be first */
-  sqlite3 *db;            /* Database connection */
-  char *zDbName;          /* Name of database holding this table */
-  char *zTableName;       /* Name of the virtual table */
+  sqlite3_vtab base;         /* Base class - must be first */
+  sqlite3 *db;               /* Database connection */
+  char *zDbName;             /* Name of database holding this table */
+  char *zTableName;          /* Name of the virtual table */
+  char *zCostTable;          /* Table holding edit-distance cost numbers */
+  EditDist3Config *pConfig3; /* Parsed edit distance costs */
 };
 
 /* Fuzzy-search cursor object */
 struct spellfix1_cursor {
   sqlite3_vtab_cursor base;    /* Base class - must be first */
-  spellfix1_vtab *pVTab;         /* The table to which this cursor belongs */
+  spellfix1_vtab *pVTab;       /* The table to which this cursor belongs */
   int nRow;                    /* Number of rows of content */
   int nAlloc;                  /* Number of allocated rows */
   int iRow;                    /* Current row of content */
@@ -1248,12 +2099,13 @@ struct spellfix1_cursor {
   int iTop;                    /* Value of the top= constraint */
   int iScope;                  /* Value of the scope= constraint */
   int nSearch;                 /* Number of vocabulary items checked */
-  struct spellfix1_row {         /* For each row of content */
+  struct spellfix1_row {       /* For each row of content */
     sqlite3_int64 iRowid;         /* Rowid for this row */
     char *zWord;                  /* Text for this row */
     int iRank;                    /* Rank for this row */
     int iDistance;                /* Distance from pattern for this row */
     int iScore;                   /* Score for sorting */
+    char zHash[SPELLFIX_MX_HASH]; /* the phonehash used for this match */
   } *a; 
 };
 
@@ -1297,6 +2149,8 @@ static int spellfix1Uninit(int isDestroy, sqlite3_vtab *pVTab){
   }
   if( rc==SQLITE_OK ){
     sqlite3_free(p->zTableName);
+    editDist3ConfigDelete(p->pConfig3);
+    sqlite3_free(p->zCostTable);
     sqlite3_free(p);
   }
   return rc;
@@ -1308,6 +2162,38 @@ static int spellfix1Destroy(sqlite3_vtab *pVTab){
   return spellfix1Uninit(1, pVTab);
 }
 
+/*
+** Make a copy of a string.  Remove leading and trailing whitespace
+** and dequote it.
+*/
+static char *spellfix1Dequote(const char *zIn){
+  char *zOut;
+  int i, j;
+  char c;
+  while( isspace(zIn[0]) ) zIn++;
+  zOut = sqlite3_mprintf("%s", zIn);
+  if( zOut==0 ) return 0;
+  i = (int)strlen(zOut);
+  while( i>0 && isspace(zOut[i-1]) ){ i--; }
+  zOut[i] = 0;
+  c = zOut[0];
+  if( c=='\'' || c=='"' ){
+    for(i=1, j=0; zOut[i]; i++){
+      zOut[j++] = zOut[i];
+      if( zOut[i]==c ){
+        if( zOut[i+1]==c ){
+          i++;
+        }else{
+          zOut[j-1] = 0;
+          break;
+        }
+      }
+    }
+  }
+  return zOut;
+}
+
+
 /*
 ** xConnect/xCreate method for the spellfix1 module. Arguments are:
 **
@@ -1330,6 +2216,7 @@ static int spellfix1Init(
   const char *zTableName = argv[2];
   int nDbName;
   int rc = SQLITE_OK;
+  int i;
 
   if( argc<3 ){
     *pzErr = sqlite3_mprintf(
@@ -1352,9 +2239,20 @@ static int spellfix1Init(
       }else{
         rc = sqlite3_declare_vtab(db, 
              "CREATE TABLE x(word,rank,distance,langid,"
-             "score,top HIDDEN,scope HIDDEN,srchcnt HIDDEN,"
-             "soundslike HIDDEN)"
+             "score, phonehash,top HIDDEN,scope HIDDEN,srchcnt HIDDEN,"
+             "soundslike HIDDEN,command HIDDEN)"
         );
+#define SPELLFIX_COL_WORD            0
+#define SPELLFIX_COL_RANK            1
+#define SPELLFIX_COL_DISTANCE        2
+#define SPELLFIX_COL_LANGID          3
+#define SPELLFIX_COL_SCORE           4
+#define SPELLFIX_COL_PHONEHASH       5
+#define SPELLFIX_COL_TOP             6
+#define SPELLFIX_COL_SCOPE           7
+#define SPELLFIX_COL_SRCHCNT         8
+#define SPELLFIX_COL_SOUNDSLIKE      9
+#define SPELLFIX_COL_COMMAND        10
       }
       if( rc==SQLITE_OK && isCreate ){
         sqlite3_uint64 r;
@@ -1376,6 +2274,14 @@ static int spellfix1Init(
            zDbName, zModule, r, zTableName
         );
       }
+      for(i=3; rc==SQLITE_OK && i<argc; i++){
+        if( memcmp(argv[i],"edit_cost_table=",16)==0 && pNew->zCostTable==0 ){
+          pNew->zCostTable = spellfix1Dequote(&argv[i][16]);
+          if( pNew->zCostTable==0 ) rc = SQLITE_NOMEM;
+          continue;
+        }
+        rc = SQLITE_ERROR; 
+      }
     }
   }
 
@@ -1406,27 +2312,44 @@ static int spellfix1Create(
 }
 
 /*
-** Reset a cursor so that it contains zero rows of content but holds
-** space for N rows.
+** Clear all of the content from a cursor.
 */
-static void spellfix1ResetCursor(spellfix1_cursor *pCur, int N){
+static void spellfix1ResetCursor(spellfix1_cursor *pCur){
   int i;
   for(i=0; i<pCur->nRow; i++){
     sqlite3_free(pCur->a[i].zWord);
   }
-  pCur->a = sqlite3_realloc(pCur->a, sizeof(pCur->a[0])*N);
-  pCur->nAlloc = N;
   pCur->nRow = 0;
   pCur->iRow = 0;
   pCur->nSearch = 0;
 }
 
+/*
+** Resize the cursor to hold up to N rows of content
+*/
+static void spellfix1ResizeCursor(spellfix1_cursor *pCur, int N){
+  struct spellfix1_row *aNew;
+  assert( N>=pCur->nRow );
+  aNew = sqlite3_realloc(pCur->a, sizeof(pCur->a[0])*N);
+  if( aNew==0 && N>0 ){
+    spellfix1ResetCursor(pCur);
+    sqlite3_free(pCur->a);
+    pCur->nAlloc = 0;
+    pCur->a = 0;
+  }else{
+    pCur->nAlloc = N;
+    pCur->a = aNew;
+  }
+}
+
+
 /*
 ** Close a fuzzy-search cursor.
 */
 static int spellfix1Close(sqlite3_vtab_cursor *cur){
   spellfix1_cursor *pCur = (spellfix1_cursor *)cur;
-  spellfix1ResetCursor(pCur, 0);
+  spellfix1ResetCursor(pCur);
+  spellfix1ResizeCursor(pCur, 0);
   sqlite3_free(pCur);
   return SQLITE_OK;
 }
@@ -1438,6 +2361,8 @@ static int spellfix1Close(sqlite3_vtab_cursor *cur){
 **   (B)    langid == $langid
 **   (C)    top = $top
 **   (D)    scope = $scope
+**   (E)    distance < $distance
+**   (F)    distance <= $distance
 **
 ** The plan number is a bit mask formed with these bits:
 **
@@ -1445,6 +2370,8 @@ static int spellfix1Close(sqlite3_vtab_cursor *cur){
 **   0x02   (B) is found
 **   0x04   (C) is found
 **   0x08   (D) is found
+**   0x10   (E) is found
+**   0x20   (F) is found
 **
 ** filter.argv[*] values contains $str, $langid, $top, and $scope,
 ** if specified and in that order.
@@ -1454,6 +2381,7 @@ static int spellfix1BestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   int iLangTerm = -1;
   int iTopTerm = -1;
   int iScopeTerm = -1;
+  int iDistTerm = -1;
   int i;
   const struct sqlite3_index_constraint *pConstraint;
   pConstraint = pIdxInfo->aConstraint;
@@ -1462,7 +2390,7 @@ static int spellfix1BestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
 
     /* Terms of the form:  word MATCH $str */
     if( (iPlan & 1)==0 
-     && pConstraint->iColumn==0
+     && pConstraint->iColumn==SPELLFIX_COL_WORD
      && pConstraint->op==SQLITE_INDEX_CONSTRAINT_MATCH
     ){
       iPlan |= 1;
@@ -1472,7 +2400,7 @@ static int spellfix1BestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
 
     /* Terms of the form:  langid = $langid  */
     if( (iPlan & 2)==0
-     && pConstraint->iColumn==3
+     && pConstraint->iColumn==SPELLFIX_COL_LANGID
      && pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ
     ){
       iPlan |= 2;
@@ -1481,7 +2409,7 @@ static int spellfix1BestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
 
     /* Terms of the form:  top = $top */
     if( (iPlan & 4)==0
-     && pConstraint->iColumn==5
+     && pConstraint->iColumn==SPELLFIX_COL_TOP
      && pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ
     ){
       iPlan |= 4;
@@ -1490,12 +2418,22 @@ static int spellfix1BestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
 
     /* Terms of the form:  scope = $scope */
     if( (iPlan & 8)==0
-     && pConstraint->iColumn==6
+     && pConstraint->iColumn==SPELLFIX_COL_SCOPE
      && pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ
     ){
       iPlan |= 8;
       iScopeTerm = i;
     }
+
+    /* Terms of the form:  distance < $dist or distance <= $dist */
+    if( (iPlan & (16|32))==0
+     && pConstraint->iColumn==SPELLFIX_COL_DISTANCE
+     && (pConstraint->op==SQLITE_INDEX_CONSTRAINT_LT
+          || pConstraint->op==SQLITE_INDEX_CONSTRAINT_LE)
+    ){
+      iPlan |= pConstraint->op==SQLITE_INDEX_CONSTRAINT_LT ? 16 : 32;
+      iDistTerm = i;
+    }
   }
   if( iPlan&1 ){
     int idx = 2;
@@ -1518,6 +2456,10 @@ static int spellfix1BestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
       pIdxInfo->aConstraintUsage[iScopeTerm].argvIndex = idx++;
       pIdxInfo->aConstraintUsage[iScopeTerm].omit = 1;
     }
+    if( iPlan&(16|32) ){
+      pIdxInfo->aConstraintUsage[iDistTerm].argvIndex = idx++;
+      pIdxInfo->aConstraintUsage[iDistTerm].omit = 1;
+    }
     pIdxInfo->estimatedCost = (double)10000;
   }else{
     pIdxInfo->idxNum = 0;
@@ -1560,6 +2502,136 @@ static int spellfix1RowCompare(const void *A, const void *B){
   return a->iScore - b->iScore;
 }
 
+/*
+** A structure used to pass information from spellfix1FilterForMatch()
+** into spellfix1RunQuery().
+*/
+typedef struct MatchQuery {
+  spellfix1_cursor *pCur;          /* The cursor being queried */
+  sqlite3_stmt *pStmt;             /* shadow table query statment */
+  char zHash[SPELLFIX_MX_HASH];    /* The current phonehash for zPattern */
+  const char *zPattern;            /* Transliterated input string */
+  int nPattern;                    /* Length of zPattern */
+  EditDist3FromString *pMatchStr3; /* Original unicode string */
+  EditDist3Config *pConfig3;       /* Edit-distance cost coefficients */
+  const EditDist3Lang *pLang;      /* The selected language coefficients */
+  int iLang;                       /* The language id */
+  int iScope;                      /* Default scope */
+  int iMaxDist;                    /* Maximum allowed edit distance, or -1 */
+  int rc;                          /* Error code */
+  int nRun;                  /* Number of prior runs for the same zPattern */
+  char azPrior[SPELLFIX_MX_RUN][SPELLFIX_MX_HASH];  /* Prior hashes */
+} MatchQuery;
+
+/*
+** Run a query looking for the best matches against zPattern using
+** zHash as the character class seed hash.
+*/
+static void spellfix1RunQuery(MatchQuery *p, const char *zQuery, int nQuery){
+  const char *zK1;
+  const char *zWord;
+  int iDist;
+  int iRank;
+  int iScore;
+  int iWorst = 0;
+  int idx;
+  int idxWorst = -1;
+  int i;
+  int iScope = p->iScope;
+  spellfix1_cursor *pCur = p->pCur;
+  sqlite3_stmt *pStmt = p->pStmt;
+  char zHash1[SPELLFIX_MX_HASH];
+  char zHash2[SPELLFIX_MX_HASH];
+  char *zClass;
+  int nClass;
+
+  if( pCur->a==0 || p->rc ) return;   /* Prior memory allocation failure */
+  if( p->nRun>=SPELLFIX_MX_RUN ) return;
+  zClass = (char*)phoneticHash((unsigned char*)zQuery, nQuery);
+  if( zClass==0 ){
+    p->rc = SQLITE_NOMEM;
+    return;
+  }
+  nClass = strlen(zClass);
+  if( nClass>SPELLFIX_MX_HASH-2 ){
+    nClass = SPELLFIX_MX_HASH-2;
+    zClass[nClass] = 0;
+  }
+  if( nClass<=iScope ){
+    if( nClass>2 ){
+      iScope = nClass-1;
+    }else{
+      iScope = nClass;
+    }
+  }
+  memcpy(zHash1, zClass, iScope);
+  sqlite3_free(zClass);
+  zHash1[iScope] = 0;
+  memcpy(zHash2, zHash1, iScope);
+  zHash2[iScope] = 'Z';
+  zHash2[iScope+1] = 0;
+  for(i=0; i<p->nRun; i++){
+    if( strcmp(p->azPrior[i], zHash1)==0 ) return;
+  }
+  memcpy(p->azPrior[p->nRun++], zHash1, iScope+1);
+  sqlite3_bind_text(pStmt, 1, zHash1, -1, SQLITE_STATIC);
+  sqlite3_bind_text(pStmt, 2, zHash2, -1, SQLITE_STATIC);
+  for(i=0; i<pCur->nRow; i++){
+    if( pCur->a[i].iScore>iWorst ){
+      iWorst = pCur->a[i].iScore;
+      idxWorst = i;
+    }
+  }
+  while( sqlite3_step(pStmt)==SQLITE_ROW ){
+    iRank = sqlite3_column_int(pStmt, 2);
+    if( p->pMatchStr3 ){
+      int nWord = sqlite3_column_bytes(pStmt, 1);
+      zWord = (const char*)sqlite3_column_text(pStmt, 1);
+      iDist = editDist3Core(p->pMatchStr3, zWord, nWord, p->pLang);
+    }else{
+      zK1 = (const char*)sqlite3_column_text(pStmt, 3);
+      if( zK1==0 ) continue;
+      iDist = editdist1(p->zPattern, zK1, pCur->iLang);
+    }
+    pCur->nSearch++;
+    iScore = spellfix1Score(iDist,iRank);
+    if( p->iMaxDist>=0 ){
+      if( iDist>p->iMaxDist ) continue;
+      if( pCur->nRow>=pCur->nAlloc-1 ){
+        spellfix1ResizeCursor(pCur, pCur->nAlloc*2 + 10);
+        if( pCur->a==0 ) break;
+      }
+      idx = pCur->nRow;
+    }else if( pCur->nRow<pCur->nAlloc ){
+      idx = pCur->nRow;
+    }else if( iScore<iWorst ){
+      idx = idxWorst;
+      sqlite3_free(pCur->a[idx].zWord);
+    }else{
+      continue;
+    }
+    pCur->a[idx].zWord = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
+    pCur->a[idx].iRowid = sqlite3_column_int64(pStmt, 0);
+    pCur->a[idx].iRank = iRank;
+    pCur->a[idx].iDistance = iDist;
+    pCur->a[idx].iScore = iScore;
+    memcpy(pCur->a[idx].zHash, zHash1, iScope+1);
+    if( pCur->nRow<pCur->nAlloc ) pCur->nRow++;
+    if( pCur->nRow==pCur->nAlloc ){
+      iWorst = pCur->a[0].iScore;
+      idxWorst = 0;
+      for(i=1; i<pCur->nRow; i++){
+        iScore = pCur->a[i].iScore;
+        if( iWorst<iScore ){
+          iWorst = iScore;
+          idxWorst = i;
+        }
+      }
+    }
+  }
+  sqlite3_reset(pStmt);
+}
+
 /*
 ** This version of the xFilter method work if the MATCH term is present
 ** and we are doing a scan.
@@ -1570,19 +2642,31 @@ static int spellfix1FilterForMatch(
   int argc,
   sqlite3_value **argv
 ){
-  const unsigned char *zPatternIn;
-  char *zPattern;
-  int nPattern;
-  char *zClass;
-  int nClass;
-  int iLimit = 20;
-  int iScope = 4;
-  int iLang = 0;
-  char *zSql;
-  int rc;
-  sqlite3_stmt *pStmt;
-  int idx = 1;
-  spellfix1_vtab *p = pCur->pVTab;
+  const unsigned char *zMatchThis;   /* RHS of the MATCH operator */
+  EditDist3FromString *pMatchStr3 = 0; /* zMatchThis as an editdist string */
+  char *zPattern;                    /* Transliteration of zMatchThis */
+  int nPattern;                      /* Length of zPattern */
+  int iLimit = 20;                   /* Max number of rows of output */
+  int iScope = 3;                    /* Use this many characters of zClass */
+  int iLang = 0;                     /* Language code */
+  char *zSql;                        /* SQL of shadow table query */
+  sqlite3_stmt *pStmt;               /* Shadow table query */
+  int rc;                            /* Result code */
+  int idx = 1;                       /* Next available filter parameter */
+  spellfix1_vtab *p = pCur->pVTab;   /* The virtual table that owns pCur */
+  MatchQuery x;                      /* For passing info to RunQuery() */
+
+  /* Load the cost table if we have not already done so */
+  if( p->zCostTable!=0 && p->pConfig3==0 ){
+    p->pConfig3 = sqlite3_malloc( sizeof(p->pConfig3[0]) );
+    if( p->pConfig3==0 ) return SQLITE_NOMEM;
+    memset(p->pConfig3, 0, sizeof(p->pConfig3[0]));
+    rc = editDist3ConfigLoad(p->pConfig3, p->db, p->zCostTable);
+    if( rc ) return rc;
+  }
+  memset(&x, 0, sizeof(x));
+  x.iScope = 3;  /* Default scope if none specified by "WHERE scope=N" */
+  x.iMaxDist = -1;   /* Maximum allowed edit distance */
 
   if( idxNum&2 ){
     iLang = sqlite3_value_int(argv[idx++]);
@@ -1592,83 +2676,79 @@ static int spellfix1FilterForMatch(
     if( iLimit<1 ) iLimit = 1;
   }
   if( idxNum&8 ){
-    iScope = sqlite3_value_int(argv[idx++]);
-    if( iScope<1 ) iScope = 1;
+    x.iScope = sqlite3_value_int(argv[idx++]);
+    if( x.iScope<1 ) x.iScope = 1;
+    if( x.iScope>SPELLFIX_MX_HASH-2 ) x.iScope = SPELLFIX_MX_HASH-2;
   }
-  spellfix1ResetCursor(pCur, iLimit);
-  zPatternIn = sqlite3_value_text(argv[0]);
-  if( zPatternIn==0 ) return SQLITE_OK;
-  zPattern = (char*)transliterate(zPatternIn, sqlite3_value_bytes(argv[0]));
+  if( idxNum&(16|32) ){
+    x.iMaxDist = sqlite3_value_int(argv[idx++]);
+    if( idxNum&16 ) x.iMaxDist--;
+    if( x.iMaxDist<0 ) x.iMaxDist = 0;
+  }
+  spellfix1ResetCursor(pCur);
+  spellfix1ResizeCursor(pCur, iLimit);
+  zMatchThis = sqlite3_value_text(argv[0]);
+  if( zMatchThis==0 ) return SQLITE_OK;
+  if( p->pConfig3 ){
+    x.pLang = editDist3FindLang(p->pConfig3, iLang);
+    pMatchStr3 = editDist3FromStringNew(x.pLang, (const char*)zMatchThis, -1);
+  }else{
+    x.pLang = 0;
+  }
+  zPattern = (char*)transliterate(zMatchThis, sqlite3_value_bytes(argv[0]));
   if( zPattern==0 ) return SQLITE_NOMEM;
   nPattern = strlen(zPattern);
   if( zPattern[nPattern-1]=='*' ) nPattern--;
-  if( nPattern<iScope ) iScope = nPattern;
-  zClass = (char*)characterClassString((unsigned char*)zPattern,
-                                       strlen(zPattern));
-  nClass = strlen(zClass);
-  if( nClass>iScope ){
-    zClass[iScope] = 0;
-    nClass = iScope;
-  }
   zSql = sqlite3_mprintf(
      "SELECT id, word, rank, k1"
      "  FROM \"%w\".\"%w_vocab\""
-     " WHERE langid=%d AND k2 GLOB '%q*'",
-     p->zDbName, p->zTableName, iLang, zClass
+     " WHERE langid=%d AND k2>=?1 AND k2<?2",
+     p->zDbName, p->zTableName, iLang
   );
   rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
   sqlite3_free(zSql);
-  if( rc==SQLITE_OK ){
-    const char *zK1;
-    int iDist;
-    int iRank;
-    int iScore;
-    int iWorst = 999999999;
-    int idx;
-    int idxWorst;
-    int i;
+  pCur->iLang = iLang;
+  x.pCur = pCur;
+  x.pStmt = pStmt;
+  x.zPattern = zPattern;
+  x.nPattern = nPattern;
+  x.pMatchStr3 = pMatchStr3;
+  x.iLang = iLang;
+  x.rc = rc;
+  x.pConfig3 = p->pConfig3;
+  if( x.rc==SQLITE_OK ){
+    spellfix1RunQuery(&x, zPattern, nPattern);
+  }
 
-    while( sqlite3_step(pStmt)==SQLITE_ROW ){
-      zK1 = (const char*)sqlite3_column_text(pStmt, 3);
-      if( zK1==0 ) continue;
-      pCur->nSearch++;
-      iRank = sqlite3_column_int(pStmt, 2);
-      iDist = editdist(zPattern, zK1);
-      iScore = spellfix1Score(iDist,iRank);
-      if( pCur->nRow<pCur->nAlloc ){
-        idx = pCur->nRow;
-      }else if( iScore<iWorst ){
-        idx = idxWorst;
-        sqlite3_free(pCur->a[idx].zWord);
-      }else{
-        continue;
-      }
-      pCur->a[idx].zWord = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1));
-      pCur->a[idx].iRowid = sqlite3_column_int64(pStmt, 0);
-      pCur->a[idx].iRank = iRank;
-      pCur->a[idx].iDistance = iDist;
-      pCur->a[idx].iScore = iScore;
-      if( pCur->nRow<pCur->nAlloc ) pCur->nRow++;
-      if( pCur->nRow==pCur->nAlloc ){
-        iWorst = pCur->a[0].iScore;
-        idxWorst = 0;
-        for(i=1; i<pCur->nRow; i++){
-          iScore = pCur->a[i].iScore;
-          if( iWorst<iScore ){
-            iWorst = iScore;
-            idxWorst = i;
-          }
-        }
+#if 0
+  /* Convert "ght" to "t" in the original pattern and try again */
+  if( x.rc==SQLITE_OK ){
+    int i, j;                         /* Loop counters */
+    char zQuery[50];                  /* Space for alternative query string */
+    for(i=j=0; i<nPattern && i<sizeof(zQuery)-1; i++){
+      char c = zPattern[i];
+      if( c=='g' && i<nPattern-2 && zPattern[i+1]=='h' && zPattern[i+2]=='t' ){
+        i += 2;
+        c= 't';
       }
+      zQuery[j++] = c;
+    }
+    zQuery[j] = 0;
+    if( j<i ){
+      spellfix1RunQuery(&x, zQuery, j);
     }
   }
-  qsort(pCur->a, pCur->nRow, sizeof(pCur->a[0]), spellfix1RowCompare);
-  pCur->iTop = iLimit;
-  pCur->iScope = iScope;
+#endif
+
+  if( pCur->a ){
+    qsort(pCur->a, pCur->nRow, sizeof(pCur->a[0]), spellfix1RowCompare);
+    pCur->iTop = iLimit;
+    pCur->iScope = iScope;
+  }
   sqlite3_finalize(pStmt);
   sqlite3_free(zPattern);
-  sqlite3_free(zClass);
-  return SQLITE_OK;
+  editDist3FromStringDelete(pMatchStr3);
+  return pCur->a ? x.rc : SQLITE_NOMEM;
 }
 
 /*
@@ -1680,7 +2760,8 @@ static int spellfix1FilterForFullScan(
   int argc,
   sqlite3_value **argv
 ){
-  spellfix1ResetCursor(pCur, 0);
+  spellfix1ResetCursor(pCur);
+  spellfix1ResizeCursor(pCur, 0);
   return SQLITE_OK;
 }
 
@@ -1729,35 +2810,39 @@ static int spellfix1Eof(sqlite3_vtab_cursor *cur){
 static int spellfix1Column(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
   spellfix1_cursor *pCur = (spellfix1_cursor*)cur;
   switch( i ){
-    case 0: {
+    case SPELLFIX_COL_WORD: {
       sqlite3_result_text(ctx, pCur->a[pCur->iRow].zWord, -1, SQLITE_STATIC);
       break;
     }
-    case 1: {
+    case SPELLFIX_COL_RANK: {
       sqlite3_result_int(ctx, pCur->a[pCur->iRow].iRank);
       break;
     }
-    case 2: {
+    case SPELLFIX_COL_DISTANCE: {
       sqlite3_result_int(ctx, pCur->a[pCur->iRow].iDistance);
       break;
     }
-    case 3: {
+    case SPELLFIX_COL_LANGID: {
       sqlite3_result_int(ctx, pCur->iLang);
       break;
     }
-    case 4: {
+    case SPELLFIX_COL_SCORE: {
       sqlite3_result_int(ctx, pCur->a[pCur->iRow].iScore);
       break;
     }
-    case 5: {
+    case SPELLFIX_COL_PHONEHASH: {
+      sqlite3_result_text(ctx, pCur->a[pCur->iRow].zHash, -1, SQLITE_STATIC);
+      break;
+    }
+    case SPELLFIX_COL_TOP: {
       sqlite3_result_int(ctx, pCur->iTop);
       break;
     }
-    case 6: {
+    case SPELLFIX_COL_SCOPE: {
       sqlite3_result_int(ctx, pCur->iScope);
       break;
     }
-    case 7: {
+    case SPELLFIX_COL_SRCHCNT: {
       sqlite3_result_int(ctx, pCur->nSearch);
       break;
     }
@@ -1799,20 +2884,37 @@ static int spellfix1Update(
                            " WHERE id=%lld",
                   p->zDbName, p->zTableName, rowid);
   }else{
-    const unsigned char *zWord = sqlite3_value_text(argv[2]);
-    int nWord = sqlite3_value_bytes(argv[2]);
-    int iLang = sqlite3_value_int(argv[5]);
-    int iRank = sqlite3_value_int(argv[3]);
-    const unsigned char *zSoundslike = sqlite3_value_text(argv[10]);
-    int nSoundslike = sqlite3_value_bytes(argv[10]);
+    const unsigned char *zWord = sqlite3_value_text(argv[SPELLFIX_COL_WORD+2]);
+    int nWord = sqlite3_value_bytes(argv[SPELLFIX_COL_WORD+2]);
+    int iLang = sqlite3_value_int(argv[SPELLFIX_COL_LANGID+2]);
+    int iRank = sqlite3_value_int(argv[SPELLFIX_COL_RANK+2]);
+    const unsigned char *zSoundslike =
+           sqlite3_value_text(argv[SPELLFIX_COL_SOUNDSLIKE+2]);
+    int nSoundslike = sqlite3_value_bytes(argv[SPELLFIX_COL_SOUNDSLIKE+2]);
     char *zK1, *zK2;
     int i;
     char c;
 
     if( zWord==0 ){
-      pVTab->zErrMsg = sqlite3_mprintf("%w.word may not be NULL",
-                            p->zTableName);
-      return SQLITE_CONSTRAINT;
+      /* Inserts of the form:  INSERT INTO table(command) VALUES('xyzzy');
+      ** cause zWord to be NULL, so we look at the "command" column to see
+      ** what special actions to take */
+      const char *zCmd = 
+         (const char*)sqlite3_value_text(argv[SPELLFIX_COL_COMMAND+2]);
+      if( zCmd==0 ){
+        pVTab->zErrMsg = sqlite3_mprintf("%s.word may not be NULL",
+                                         p->zTableName);
+        return SQLITE_CONSTRAINT;
+      }
+      if( strcmp(zCmd,"reset")==0 ){
+        /* Reset the  edit cost table (if there is one). */
+        editDist3ConfigDelete(p->pConfig3);
+        p->pConfig3 = 0;
+        return SQLITE_OK;
+      }
+      pVTab->zErrMsg = sqlite3_mprintf("unknown value for %s.command: \"%w\"",
+                                       p->zTableName, zCmd);
+      return SQLITE_ERROR;
     }
     if( iRank<1 ) iRank = 1;
     if( zSoundslike ){
@@ -1824,7 +2926,7 @@ static int spellfix1Update(
     for(i=0; (c = zK1[i])!=0; i++){
        if( c>='A' && c<='Z' ) zK1[i] += 'a' - 'A';
     }
-    zK2 = (char*)characterClassString((const unsigned char*)zK1, i);
+    zK2 = (char*)phoneticHash((const unsigned char*)zK1, i);
     if( zK2==0 ){
       sqlite3_free(zK1);
       return SQLITE_NOMEM;
@@ -1912,16 +3014,23 @@ static int spellfix1Register(sqlite3 *db){
                                   transliterateSqlFunc, 0, 0);
   nErr += sqlite3_create_function(db, "spellfix1_editdist", 2, SQLITE_UTF8, 0,
                                   editdistSqlFunc, 0, 0);
-  nErr += sqlite3_create_function(db, "spellfix1_charclass", 1, SQLITE_UTF8, 0,
-                                  characterClassSqlFunc, 0, 0);
+  nErr += sqlite3_create_function(db, "spellfix1_editdist", 3, SQLITE_UTF8, 0,
+                                  editdistSqlFunc, 0, 0);
+  nErr += sqlite3_create_function(db, "spellfix1_phonehash", 1, SQLITE_UTF8, 0,
+                                  phoneticHashSqlFunc, 0, 0);
   nErr += sqlite3_create_function(db, "spellfix1_scriptcode", 1, SQLITE_UTF8, 0,
                                   scriptCodeSqlFunc, 0, 0);
+  nErr += sqlite3_create_function(db, "pollock_skeleton", 1, SQLITE_UTF8, 0,
+                                  pollockSkeletonSqlFunc, 0, 0);
+  nErr += sqlite3_create_function(db, "pollock_omission", 1, SQLITE_UTF8, 0,
+                                  pollockOmissionSqlFunc, 0, 0);
   nErr += sqlite3_create_module(db, "spellfix1", &spellfix1Module, 0);
+  nErr += editDist3Install(db);
 
   /* Verify sanity of the translit[] table */
   for(i=0; i<sizeof(translit)/sizeof(translit[0])-1; i++){
     assert( translit[i].cFrom<translit[i+1].cFrom );
-  }  
+  }
 
   return nErr ? SQLITE_ERROR : SQLITE_OK;
 }