Support for ae, oe, and ss normalization

Change replacement character to chr(26)
ManiacDC · Aug 18, 2015 · 7f969cb · 7f969cb
1 parent 107cf01
commit 7f969cb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/Source/Includes/Conversions.ahk b/Source/Includes/Conversions.ahk
@@ -1,7 +1,7 @@
 ; these functions handle database conversion
 ; always set the SetDbVersion default argument to the current highest version
 
-SetDbVersion(dBVersion = 6)
+SetDbVersion(dBVersion = 7)
 {
 	global g_WordListDB
 	g_WordListDB.Query("INSERT OR REPLACE INTO LastState VALUES ('databaseVersion', '" . dBVersion . "', NULL);")
@@ -74,6 +74,11 @@ MaybeConvertDatabase()
 		RunConversionSix()
 	}
 
+	if (databaseVersion < 7)
+	{
+		RunConversionSeven()
+	}
+
 	return, false
 }
 
@@ -197,6 +202,12 @@ RunConversionFive()
 
 ; normalize accented characters
 RunConversionSix()
+{
+	; superseded by conversion 7
+}
+
+; normalize accented characters
+RunConversionSeven()
 {
 	global g_WordListDB
 	g_WordListDB.BeginTransaction()
@@ -210,14 +221,14 @@ RunConversionSix()
 		WordIndexed := row[2]
 		WordReplacement := row[3]
 
-		TransformWord(Word, WordReplacement, WordDescription, WordTransformed, WordIndexTransformed, WordReplacementTransformed, WordDescriptionTransformed)
+		TransformWord(Word, WordReplacement, WordDescription, WordTransformed, WordIndexedTransformed, WordReplacementTransformed, WordDescriptionTransformed)
 
-		StringReplace, OldWordIndexedTransformed, WordIndex, ', '', All
+		StringReplace, OldWordIndexedTransformed, WordIndexed, ', '', All
 
-		g_WordListDB.Query("UPDATE Words SET wordindexed = '" . WordIndexTransformed . "' WHERE word = '" . WordTransformed . "' AND wordindexed = '" . OldWordIndexedTransformed . "' AND wordreplacement = '" . WordReplacementTransformed . "';")
+		g_WordListDB.Query("UPDATE Words SET wordindexed = '" . WordIndexedTransformed . "' WHERE word = '" . WordTransformed . "' AND wordindexed = '" . OldWordIndexedTransformed . "' AND wordreplacement = '" . WordReplacementTransformed . "';")
 	}
 
-	SetDbVersion(6)
+	SetDbVersion(7)
 	g_WordListDB.EndTransaction()
 }
 

diff --git a/Source/Includes/ListBox.ahk b/Source/Includes/ListBox.ahk
@@ -427,7 +427,7 @@ AddToMatchList(position, MaxLength, HalfLength, LongestBaseLength, ComputeBaseLe
    {
       if (g_SingleMatchReplacement[position])
       {
-         CurrentMatch .= "->" . g_SingleMatchReplacement[position]
+         CurrentMatch .= " " . chr(26) . " " . g_SingleMatchReplacement[position]
       }
       if (g_SingleMatchDescription[position])
       {

diff --git a/Source/Includes/Wordlist.ahk b/Source/Includes/Wordlist.ahk
@@ -316,11 +316,13 @@ CheckValid(Word,ForceLearn=false)
 
 TransformWord(AddWord, AddWordReplacement, AddWordDescription, ByRef AddWordTransformed, ByRef AddWordIndexTransformed, ByRef AddWordReplacementTransformed, ByRef AddWordDescriptionTransformed)
 {
-   StringUpper, AddWordIndex, AddWord
+   AddWordIndex := AddWord
 
    ; normalize accented characters
    AddWordIndex := StrUnmark(AddWordIndex)
 
+   StringUpper, AddWordIndex, AddWordIndex
+
    StringReplace, AddWordTransformed, AddWord, ', '', All
    StringReplace, AddWordIndexTransformed, AddWordIndex, ', '', All
    if (AddWordReplacement) {
@@ -463,5 +465,14 @@ StrUnmark(string) {
       len *= -1  ; This is the new estimate.
    }
    ; Remove combining marks and return result.
-   return RegExReplace(StrGet(&buf, len, "UTF-16"), "\pM")
+   string := RegExReplace(StrGet(&buf, len, "UTF-16"), "\pM")
+
+   StringReplace, string, string, æ, ae, All
+   StringReplace, string, string, Æ, AE, All
+   StringReplace, string, string, , oe, All
+   StringReplace, string, string, , OE, All
+   StringReplace, string, string, ß, ss, All   
+
+   return, string  
+
 }