hg/stx-libbasic2: comparison PhoneticStringUtilities.st

equal deleted inserted replaced

-:e83d602a2aa7
+:d465fa29df0e
 schulz      S242    24200000    SKLS        SHULS   ZULZ        S4800000    484000  CULC        85
 becker      B260    12600000    BKR         BEKA    BEKA        B2000000    759000  BCR         147
 hoffmann    H155    15500000    HFMN        HOFMAN  UFNAN       $7550000    576600  OVMAN       036
 sch�fer     S216    21600000    SKFR        SHEFA   ZEFA        S7000000    479000  CVR         837
 "
-! !
-!PhoneticStringUtilities class methodsFor:'classification'!
-isSlavoGermanic:aString
-^ #('w' 'k' 'cz' 'witz') contains:[:sub | aString includesString:sub]
-"
-self isSlavoGermanic:'walter'
-"
 ! !
 !PhoneticStringUtilities class methodsFor:'phonetic codes'!
 koelnerPhoneticCodeOf:aString
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 USE OR OTHER DEALINGS IN THE SOFTWARE.'
 "
 ! !
+!PhoneticStringUtilities::DoubleMetaphoneStringComparator class methodsFor:'classification'!
+isSlavoGermanic:aString
+^ #('w' 'k' 'cz' 'witz') contains:[:sub | aString includesString:sub]
+"
+self isSlavoGermanic:'walter'
+"
+! !
 !PhoneticStringUtilities::DoubleMetaphoneStringComparator class methodsFor:'documentation'!
 documentaion
 "
 The Double Metaphone algorithm:
 				addSecondaryTranslation: 'A'.
 			self incrementStartIndex ]
 !
 processB
-	self
+self
-		addPrimaryTranslation: 'P';
+addPrimaryTranslation: 'P';
-		addSecondaryTranslation: 'P'.
+addSecondaryTranslation: 'P'.
-	(self keyAt: (self currentIndex + 1)) = $B
+(self keyAt: (currentIndex + 1)) = $B
-		ifTrue: [ self incrementSkipCount ].
+ifTrue: [ self incrementSkipCount ].
 !
 processC
-	"i"
+"i"
-	((((currentIndex >= 3
+((((currentIndex >= 3
-		and: [ (self keyAt: self currentIndex-2) isVowel not ])
+and: [ (self keyAt: currentIndex-2) isVowel not ])
-		and: [ (self keyMidString: 3 from: self currentIndex-1) = 'ACH' ])
+and: [ (self keyMidString: 3 from: currentIndex-1) = 'ACH' ])
-		and: [ (self keyAt: self currentIndex+2) ~= $I ])
+and: [ (self keyAt: currentIndex+2) ~= $I ])
-		and: [ ((self keyAt: self currentIndex+2) ~= $E)
+and: [ ((self keyAt: currentIndex+2) ~= $E)
-				or: [ (self keyMidString: 6 from: self currentIndex-2) ~= 'BACHER'
+or: [ (self keyMidString: 6 from: currentIndex-2) ~= 'BACHER'
-						and: [ (self keyMidString: 6 from: self currentIndex-2) ~= 'MACHER' ] ] ])
+and: [ (self keyMidString: 6 from: currentIndex-2) ~= 'MACHER' ] ] ])
-			ifTrue:
+ifTrue:
-				[ self addPrimaryTranslation: 'K'.
+[ self addPrimaryTranslation: 'K'.
-				self addSecondaryTranslation: 'K'.
+self addSecondaryTranslation: 'K'.
-				self incrementSkipCount: 2.
+self incrementSkipCount: 2.
-				^self ].
+^self ].
-	"ii"
+"ii"
-	(self inputKey beginsWith: 'CAESAR')
+(self inputKey beginsWith: 'CAESAR')
-		ifTrue:
+ifTrue:
-			[ self addPrimaryTranslation: 'S'.
+[ self addPrimaryTranslation: 'S'.
-			self addSecondaryTranslation: 'S'.
+self addSecondaryTranslation: 'S'.
-			self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-			^self ].
+^self ].
-	"iii"
+"iii"
-	(self keyMidString: 4 from: self currentIndex) = 'CHIA'
+(self keyMidString: 4 from: currentIndex) = 'CHIA'
-		ifTrue:
+ifTrue:
-			[ self addPrimaryTranslation: 'K'.
+[ self addPrimaryTranslation: 'K'.
-			self addSecondaryTranslation: 'K'.
+self addSecondaryTranslation: 'K'.
-			self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-			^self ].
+^self ].
-	"iv"
+"iv"
-	(self keyMidString: 2 from: self currentIndex) = 'CH'
+(self keyMidString: 2 from: currentIndex) = 'CH'
-		ifTrue:
+ifTrue:
-			[ (self currentIndex > 1		"a"
+[ (currentIndex > 1                "a"
-					and: [ (self keyMidString: 4 from: self currentIndex) = 'CHAE' ])
+and: [ (self keyMidString: 4 from: currentIndex) = 'CHAE' ])
-				ifTrue: [ self
+ifTrue: [ self
-						addPrimaryTranslation: 'K';
+addPrimaryTranslation: 'K';
-						addSecondaryTranslation: 'X';
+addSecondaryTranslation: 'X';
-						incrementSkipCount: 1.
+incrementSkipCount: 1.
-						^self ].
+^self ].
-			(self currentIndex = 1		"b"
+(currentIndex = 1          "b"
-					and: [ (self inputKey size > 5 and: [(self inputKey copyFrom: 1 to: 6) = 'CHARAC'
+and: [ (self inputKey size > 5 and: [(self inputKey copyFrom: 1 to: 6) = 'CHARAC'
-							or: [ (self inputKey copyFrom: 1 to: 6) = 'CHARIS' ]] )
+or: [ (self inputKey copyFrom: 1 to: 6) = 'CHARIS' ]] )
-						or: [self inputKey size > 4 and: [ ((((self inputKey copyFrom: 1 to: 4) = 'CHOR'
+or: [self inputKey size > 4 and: [ ((((self inputKey copyFrom: 1 to: 4) = 'CHOR'
-							or: [ (self inputKey copyFrom: 1 to: 4) = 'CHYM' ])
+or: [ (self inputKey copyFrom: 1 to: 4) = 'CHYM' ])
-							or: [ (self inputKey copyFrom: 1 to: 4) = 'CHIA' ])
+or: [ (self inputKey copyFrom: 1 to: 4) = 'CHIA' ])
-							or: [ (self inputKey copyFrom: 1 to: 4) = 'CHEM' ])
+or: [ (self inputKey copyFrom: 1 to: 4) = 'CHEM' ])
-							and: [ (self inputKey copyFrom: 1 to: 4) ~= 'CHORE' ] ] ] ])
+and: [ (self inputKey copyFrom: 1 to: 4) ~= 'CHORE' ] ] ] ])
-				ifTrue: [ self
+ifTrue: [ self
-						addPrimaryTranslation: 'K';
+addPrimaryTranslation: 'K';
-						addSecondaryTranslation: 'K';
+addSecondaryTranslation: 'K';
-						incrementSkipCount: 1.
+incrementSkipCount: 1.
-						^self ].
+^self ].
-			(((((#('VAN ' 'VON ') includes: (self inputKey copyFrom: 1 to: 4))		"c"
+(((((#('VAN ' 'VON ') includes: (self inputKey copyFrom: 1 to: 4))              "c"
-					or: [ (self inputKey copyFrom: 1 to: 3) = 'SCH' ])
+or: [ (self inputKey copyFrom: 1 to: 3) = 'SCH' ])
-					or: [ #('ORCHES' 'ARCHIT' 'ORCHID')
+or: [ #('ORCHES' 'ARCHIT' 'ORCHID')
-							includes: (self keyMidString: 6 from: self currentIndex-2) ])
+includes: (self keyMidString: 6 from: currentIndex-2) ])
-					or: [ #($T $S) includes: (self keyAt: self currentIndex+2) ])
+or: [ #($T $S) includes: (self keyAt: currentIndex+2) ])
-					or: [ ((self currentIndex = 1)
+or: [ ((currentIndex = 1)
-							or: [ #($A $O $U $E) includes: (self keyAt: self currentIndex-1) ])
+or: [ #($A $O $U $E) includes: (self keyAt: currentIndex-1) ])
-						and: [ #($L $R $N $M $B $H $F $V $W $ ) includes: (self keyAt: self currentIndex+2) ] ] )
+and: [ #($L $R $N $M $B $H $F $V $W $ ) includes: (self keyAt: currentIndex+2) ] ] )
-				ifTrue:
+ifTrue:
-					[ self
+[ self
-						addPrimaryTranslation: 'K';
+addPrimaryTranslation: 'K';
-						addSecondaryTranslation: 'K';
+addSecondaryTranslation: 'K';
-						incrementSkipCount: 1.
+incrementSkipCount: 1.
-						^self ]
+^self ]
-				ifFalse:
+ifFalse:
-					[ self currentIndex > 1
+[ currentIndex > 1
-						ifTrue:
+ifTrue:
-							[ (self inputKey copyFrom: 1 to: 2) = 'MC'
+[ (self inputKey copyFrom: 1 to: 2) = 'MC'
-								ifTrue:
+ifTrue:
-										[ self
+[ self
-												addPrimaryTranslation: 'K';
+addPrimaryTranslation: 'K';
-												addSecondaryTranslation: 'K' ]
+addSecondaryTranslation: 'K' ]
-								ifFalse:
+ifFalse:
-										[ self
+[ self
-												addPrimaryTranslation: 'X';
+addPrimaryTranslation: 'X';
-												addSecondaryTranslation: 'K' ] ]
+addSecondaryTranslation: 'K' ] ]
-						ifFalse:
+ifFalse:
-							[ self
+[ self
-								addPrimaryTranslation: 'X';
+addPrimaryTranslation: 'X';
-								addSecondaryTranslation: 'X' ].
+addSecondaryTranslation: 'X' ].
-					self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-					^self ] ].
+^self ] ].
-	"v"
+"v"
-	(self keyAt: self currentIndex+1) = $Z
+(self keyAt: currentIndex+1) = $Z
-		ifTrue:
+ifTrue:
-			[ self
+[ self
-				addPrimaryTranslation: 'S';
+addPrimaryTranslation: 'S';
-				addSecondaryTranslation: 'X';
+addSecondaryTranslation: 'X';
-				incrementSkipCount: 1.
+incrementSkipCount: 1.
-				^self ].
+^self ].
-	"vi"
+"vi"
-	(self keyMidString: 3 from: self currentIndex+1) = 'CIA'
+(self keyMidString: 3 from: currentIndex+1) = 'CIA'
-		ifTrue:
+ifTrue:
-			[ self
+[ self
-				addPrimaryTranslation: 'X';
+addPrimaryTranslation: 'X';
-				addSecondaryTranslation: 'X';
+addSecondaryTranslation: 'X';
-				incrementSkipCount: 2.
+incrementSkipCount: 2.
-				^self ].
+^self ].
-	"vii"
+"vii"
-	((self keyAt: self currentIndex+1) = $C
+((self keyAt: currentIndex+1) = $C
-			and: [ ((currentIndex = 2)
+and: [ ((currentIndex = 2)
-				and: [ (self keyAt: 1) = $M ]) not ])
+and: [ (self keyAt: 1) = $M ]) not ])
-		ifTrue:
+ifTrue:
-			[ ((#($I $E $H) includes: (self keyAt: self currentIndex+2))
+[ ((#($I $E $H) includes: (self keyAt: currentIndex+2))
-					and: [ (self keyMidString: 2 from: self currentIndex+2) ~= 'HU' ])
+and: [ (self keyMidString: 2 from: currentIndex+2) ~= 'HU' ])
-				ifTrue:
+ifTrue:
-					[ ((self currentIndex = 2 and: [ (self keyAt: 1) = $A ])
+[ ((currentIndex = 2 and: [ (self keyAt: 1) = $A ])
-							or: [ #('UCCEE' 'UCCES') includes: (self keyMidString: 5 from: self currentIndex-1)])
+or: [ #('UCCEE' 'UCCES') includes: (self keyMidString: 5 from: currentIndex-1)])
-						ifTrue:
+ifTrue:
-							[self
+[self
-								addPrimaryTranslation: 'KS';
+addPrimaryTranslation: 'KS';
-								addSecondaryTranslation: 'KS';
+addSecondaryTranslation: 'KS';
-								incrementSkipCount: 2.
+incrementSkipCount: 2.
-								^self ]
+^self ]
-						ifFalse:
+ifFalse:
-							[self
+[self
-								addPrimaryTranslation: 'X';
+addPrimaryTranslation: 'X';
-								addSecondaryTranslation: 'X';
+addSecondaryTranslation: 'X';
-								incrementSkipCount: 2.
+incrementSkipCount: 2.
-								^self ] ]
+^self ] ]
-				ifFalse:
+ifFalse:
-					[ self
+[ self
-						addPrimaryTranslation: 'K';
+addPrimaryTranslation: 'K';
-						addSecondaryTranslation: 'K';
+addSecondaryTranslation: 'K';
-						incrementSkipCount: 2.
+incrementSkipCount: 2.
-						^self ] ].
+^self ] ].
-	"viii"
+"viii"
-	(#($K $G $Q) includes: (self keyAt: self currentIndex+1))
+(#($K $G $Q) includes: (self keyAt: currentIndex+1))
-		ifTrue:
+ifTrue:
-			[ self
+[ self
-				addPrimaryTranslation: 'K';
+addPrimaryTranslation: 'K';
-				addSecondaryTranslation: 'K';
+addSecondaryTranslation: 'K';
-				incrementSkipCount: 1.
+incrementSkipCount: 1.
-				^self ].
+^self ].
-	"ix"
+"ix"
-	(#($I $E $Y) includes: (self keyAt: self currentIndex+1))
+(#($I $E $Y) includes: (self keyAt: currentIndex+1))
-		ifTrue:
+ifTrue:
-			[ (#('CIO' 'CIE' 'CIA') includes: (self keyMidString: 3 from: self currentIndex))
+[ (#('CIO' 'CIE' 'CIA') includes: (self keyMidString: 3 from: currentIndex))
-				ifTrue:
+ifTrue:
-					[self
+[self
-						addPrimaryTranslation: 'S';
+addPrimaryTranslation: 'S';
-						addSecondaryTranslation: 'X' ]
+addSecondaryTranslation: 'X' ]
-				ifFalse:
+ifFalse:
-					[self
+[self
-						addPrimaryTranslation: 'S';
+addPrimaryTranslation: 'S';
-						addSecondaryTranslation: 'S'].
+addSecondaryTranslation: 'S'].
-			self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-			^self ].
+^self ].
-	"x"
+"x"
-	self
+self
-		addPrimaryTranslation: 'K';
+addPrimaryTranslation: 'K';
-		addSecondaryTranslation: 'K'.
+addSecondaryTranslation: 'K'.
-	"xi"
+"xi"
-	(#(' C' ' Q' ' G') includes: (self keyMidString: 2 from: self currentIndex+1))
+(#(' C' ' Q' ' G') includes: (self keyMidString: 2 from: currentIndex+1))
-		ifTrue:
+ifTrue:
-			[ self incrementSkipCount: 2 ]
+[ self incrementSkipCount: 2 ]
-		ifFalse:
+ifFalse:
-			[ ((#($C $K $Q) includes: (self keyAt: self currentIndex+1))
+[ ((#($C $K $Q) includes: (self keyAt: currentIndex+1))
-					and: [ (#('CE' 'CI') includes: (self keyMidString: 2 from: self currentIndex+1)) not ])
+and: [ (#('CE' 'CI') includes: (self keyMidString: 2 from: currentIndex+1)) not ])
-				ifTrue: [ self incrementSkipCount: 1] ]
+ifTrue: [ self incrementSkipCount: 1] ]
 !
 processCedille
 	self
 		addPrimaryTranslation: 'S';
 		addSecondaryTranslation: 'S'
 !
 processD
-	"i"
+"i"
-	(self keyAt: self currentIndex+1) = $G
+(self keyAt: currentIndex+1) = $G
-		ifTrue:
+ifTrue:
-			[ (#($I $E $Y) includes: (self keyAt: self currentIndex+2))
+[ (#($I $E $Y) includes: (self keyAt: currentIndex+2))
-				ifTrue:
+ifTrue:
-					[ self
+[ self
-						addPrimaryTranslation: 'J';
+addPrimaryTranslation: 'J';
-						addSecondaryTranslation: 'J';
+addSecondaryTranslation: 'J';
-						incrementSkipCount: 2.
+incrementSkipCount: 2.
-					^self ]
+^self ]
-				ifFalse:
+ifFalse:
-					[ self
+[ self
-						addPrimaryTranslation: 'TK';
+addPrimaryTranslation: 'TK';
-						addSecondaryTranslation: 'TK';
+addSecondaryTranslation: 'TK';
-						incrementSkipCount: 1.
+incrementSkipCount: 1.
-					^self ] ].
+^self ] ].
-	"ii"
+"ii"
-	(#($T $D) includes: (self keyAt: self currentIndex+1))
+(#($T $D) includes: (self keyAt: currentIndex+1))
-		ifTrue:
+ifTrue:
-			[ self
+[ self
-				addPrimaryTranslation: 'T';
+addPrimaryTranslation: 'T';
-				addSecondaryTranslation: 'T';
+addSecondaryTranslation: 'T';
-				incrementSkipCount: 1.
+incrementSkipCount: 1.
-			^self ].
+^self ].
-	"iii"
+"iii"
-	self
+self
-		addPrimaryTranslation: 'T';
+addPrimaryTranslation: 'T';
-		addSecondaryTranslation: 'T'
+addSecondaryTranslation: 'T'
 !
 processF
 	self
 		addPrimaryTranslation: 'F';
 "http://aspell.sourceforge.net/metaphone/dmetaph.cpp
 case 'G':
 if(GetAt(current + 1) == 'H')
 {"
 | word |
-(self keyAt: self currentIndex + 1) = $H
+(self keyAt: currentIndex + 1) = $H
 ifTrue: [
 "if((current > 0) AND !!IsVowel(current - 1))"
-(self currentIndex > 1 and: [(self keyAt: self currentIndex - 1) isVowel not])
+(currentIndex > 1 and: [(self keyAt: currentIndex - 1) isVowel not])
 ifTrue: [
 " {
 MetaphAdd(K);
 current += 2;
 break;
 { "
 currentIndex = 1
 ifTrue: [
 "if(GetAt(current + 2) == 'I')"
-(self keyAt: self currentIndex + 2) = $I
+(self keyAt: currentIndex + 2) = $I
 ifTrue: [
 "MetaphAdd(J);"
 self addPrimaryTranslation: 'J';
 addSecondaryTranslation: 'J'.
 ] ifFalse: [
 //e.g., 'bough'
 OR ((current > 2) AND StringAt((current - 3), 1, B, H, D, ) )
 //e.g., 'broughton'
 OR ((current > 3) AND StringAt((current - 4), 1, B, H, ) ) )
 "
-(((currentIndex > 2 and: [#($B $H $D) includes: (self keyAt: self currentIndex - 2)])
+(((currentIndex > 2 and: [#($B $H $D) includes: (self keyAt: currentIndex - 2)])
-or: [currentIndex > 3 and: [#($B $H $D) includes: (self keyAt: self currentIndex - 3)]])
+or: [currentIndex > 3 and: [#($B $H $D) includes: (self keyAt: currentIndex - 3)]])
-or: [currentIndex > 4 and: [#($B $H) includes: (self keyAt: self currentIndex - 4)]])
+or: [currentIndex > 4 and: [#($B $H) includes: (self keyAt: currentIndex - 4)]])
 ifTrue: [
 "current += 2;
 break;"
 ^self incrementSkipCount: 1
 ] ifFalse: [
 " //e.g., 'laugh', 'McLaughlin', 'cough', 'gough', 'rough', 'tough'
 if((current > 2)
 AND (GetAt(current - 1) == 'U')
 AND StringAt((current - 3), 1, C, G, L, R, T, ) )"
 (currentIndex > 3 and: [
-((self keyAt: self currentIndex - 1) = $U) and: [
+((self keyAt: currentIndex - 1) = $U) and: [
-#($C $G $L $R $T) includes: (self keyAt: self currentIndex - 3)
+#($C $G $L $R $T) includes: (self keyAt: currentIndex - 3)
 ]
 ]) ifTrue: [
 "MetaphAdd(F);"
 self addPrimaryTranslation: 'F';
 addSecondaryTranslation: 'F'.
 ] ifFalse: [
 " if((current > 0) AND GetAt(current - 1) !!= 'I')
 MetaphAdd(K);"
-(currentIndex > 1 and: [(self keyAt: self currentIndex - 1) ~= $I])
+(currentIndex > 1 and: [(self keyAt: currentIndex - 1) ~= $I])
 ifTrue: [
 self addPrimaryTranslation: 'K';
 addSecondaryTranslation: 'K'.
 ].
 ].
 ^self incrementSkipCount: 1
 ].
 ].
 "if(GetAt(current + 1) == 'N')"
-(self keyAt: self currentIndex + 1) = $N
+(self keyAt: currentIndex + 1) = $N
 ifTrue: [
 "if((current == 1) AND IsVowel(0) AND !!SlavoGermanic())"
 (currentIndex = 2 and: [(self inputKey at: 1) isVowel and: [(self isSlavoGermanic: self inputKey) not]])
 ifTrue: [
 "MetaphAdd(KN, N);"
 ] ifFalse: [
 " //not e.g. 'cagney'
 if(!!StringAt((current + 2), 2, EY, )
 AND (GetAt(current + 1) !!= 'Y')
 AND !!SlavoGermanic())"
-((self inputKey size >= (self currentIndex + 2)) and: [
+((self inputKey size >= (currentIndex + 2)) and: [
-(self inputKey copyFrom: self currentIndex + 2 to: (self currentIndex + 4 min: self inputKey size)) ~= 'EY' and: [
+(self inputKey copyFrom: currentIndex + 2 to: (currentIndex + 4 min: self inputKey size)) ~= 'EY' and: [
-(self keyAt: self currentIndex + 1) ~= $Y and: [
+(self keyAt: currentIndex + 1) ~= $Y and: [
 (self isSlavoGermanic: self inputKey) not
 ]
 ]
 ]) ifTrue: [
 self addPrimaryTranslation: 'N';
 ].
 ^self incrementSkipCount: 1
 ].
 " //'tagliaro'
 if(StringAt((current + 1), 2, LI, ) AND !!SlavoGermanic())"
-((self inputKey size >= (self currentIndex + 3)) and: [
+((self inputKey size >= (currentIndex + 3)) and: [
-(self inputKey copyFrom: self currentIndex + 1 to: self currentIndex + 2) = 'LI' and: [
+(self inputKey copyFrom: currentIndex + 1 to: currentIndex + 2) = 'LI' and: [
 (self isSlavoGermanic: self inputKey) not]])
 ifTrue: [
 self addPrimaryTranslation: 'KL';
 addSecondaryTranslation: 'L'.
 ^self incrementSkipCount: 1.
 ].
 " //-ges-,-gep-,-gel-, -gie- at beginning
 if((current == 0)
 AND ((GetAt(current + 1) == 'Y')
 OR StringAt((current + 1), 2, ES, EP, EB, EL, EY, IB, IL, IN, IE, EI, ER, )) )"
-(self currentIndex = 1 and: [
+(currentIndex = 1 and: [
-((self keyAt: self currentIndex + 1) = $Y) or: [
+((self keyAt: currentIndex + 1) = $Y) or: [
 (#('ES' 'EP' 'EB' 'EL' 'EY' 'IB' 'IL' 'IN' 'IE' 'EI' 'ER') includes:
-(self inputKey copyFrom: self currentIndex + 1 to: self currentIndex + 2))
+(self inputKey copyFrom: currentIndex + 1 to: currentIndex + 2))
 ]]) ifTrue: [
 self addPrimaryTranslation: 'K';
 addSecondaryTranslation: 'J'.
 ^self incrementSkipCount: 1.
 ].
 if((StringAt((current + 1), 2, ER, ) OR (GetAt(current + 1) == 'Y'))
 AND !!StringAt(0, 6, DANGER, RANGER, MANGER, )
 AND !!StringAt((current - 1), 1, E, I, )
 AND !!StringAt((current - 1), 3, RGY, OGY, ) )
 "
-(((self inputKey copyFrom: self currentIndex + 1 to: (self currentIndex + 3 min: self inputKey size)) = 'ER' or: [
+(((self inputKey copyFrom: currentIndex + 1 to: (currentIndex + 3 min: self inputKey size)) = 'ER' or: [
-((self keyAt: self currentIndex + 1) = $Y)])
+((self keyAt: currentIndex + 1) = $Y)])
 and: [((#('DANGER' 'RANGER' 'MANGER') includes: (word := self inputKey copyFrom: 1 to: (6 min: self inputKey size))) not)
-and: [(self keyAt: self currentIndex - 1) ~= $E
+and: [(self keyAt: currentIndex - 1) ~= $E
-and: [(#('RGY' 'OGY') includes: (self inputKey copyFrom: self currentIndex - 1 to: self currentIndex + 1)) not]]])
+and: [(#('RGY' 'OGY') includes: (self inputKey copyFrom: currentIndex - 1 to: currentIndex + 1)) not]]])
 ifTrue: [
 self addPrimaryTranslation: 'K';
 addSecondaryTranslation: 'J'.
 ^self incrementSkipCount: 1.
 ].
 " // italian e.g, 'biaggi'
 if(StringAt((current + 1), 1, E, I, Y, ) OR StringAt((current - 1), 4, AGGI, OGGI, ))
 "
-((#($E $I $Y) includes: (self keyAt: (self currentIndex + 1))) or: [(#('AGGI' 'OGGI') includes: (self inputKey copyFrom: self currentIndex - 1 to: (self currentIndex + 2 min: self inputKey size)))])
+((#($E $I $Y) includes: (self keyAt: (currentIndex + 1))) or: [(#('AGGI' 'OGGI') includes: (self inputKey copyFrom: currentIndex - 1 to: (currentIndex + 2 min: self inputKey size)))])
 ifTrue: [
 " //obvious germanic
 if((StringAt(0, 4, VAN , VON , ) OR StringAt(0, 3, SCH, ))
 OR StringAt((current + 1), 2, ET, ))                                                MetaphAdd(K);"
 word := (self inputKey copyFrom: 1 to: 4).
 MetaphAdd(J);
 else
 MetaphAdd(J, K);
 current += 2;
 break;"
-(((self inputKey copyFrom: self currentIndex + 1 to: (self currentIndex + 5 min: self inputKey size)), '    ') copyFrom: 1 to: 4) = 'IER '
+(((self inputKey copyFrom: currentIndex + 1 to: (currentIndex + 5 min: self inputKey size)), '    ') copyFrom: 1 to: 4) = 'IER '
 ifTrue: [
 self addPrimaryTranslation: 'J';
 addSecondaryTranslation: 'J'.
 ] ifFalse: [
 self addPrimaryTranslation: 'J';
 else
 current += 1;
 MetaphAdd(K);
 break;"
-(self keyAt: (self currentIndex + 1)) = $G
+(self keyAt: (currentIndex + 1)) = $G
 ifTrue: [
 self incrementSkipCount: 1.
 ].
 self addPrimaryTranslation: 'K';
 addSecondaryTranslation: 'K'.
 !
 processH
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'H':
+case 'H':
 //only keep if first & before vowel or btw. 2 vowels
 if(((current == 0) OR IsVowel(current - 1))
 AND IsVowel(current + 1))
 {
 MetaphAdd(H);
 }else//also takes care of 'HH'
 current += 1;
 break;
 "
-	(((self currentIndex = 1)
+(((currentIndex = 1)
-		or: [ (self keyAt: self currentIndex - 1) isVowel])
+or: [ (self keyAt: currentIndex - 1) isVowel])
-	and: [(self keyAt: self currentIndex + 1) isVowel])
+and: [(self keyAt: currentIndex + 1) isVowel])
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'H';
+self addPrimaryTranslation: 'H';
-		addSecondaryTranslation: 'H'.
+addSecondaryTranslation: 'H'.
-		^self incrementSkipCount: 1.
+^self incrementSkipCount: 1.
-	]
+]
 !
 processJ
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'J':
+case 'J':
 //obvious spanish, 'jose', 'san jacinto'
 if(StringAt(current, 4, JOSE, ) OR StringAt(0, 4, SAN , ) )
 {
 if(((current == 0) AND (GetAt(current + 4) == ' ')) OR StringAt(0, 4, SAN , ) )
 MetaphAdd(H);
 current += 2;
 else
 current += 1;
 break;
 "
-	| currentWord firstWord nextLetter |
+| currentWord firstWord nextLetter |
-	currentWord := self inputKey copyFrom: self currentIndex to: (self currentIndex + 3 min: self inputKey size).
+currentWord := self inputKey copyFrom: currentIndex to: (currentIndex + 3 min: self inputKey size).
-	firstWord := self inputKey copyFrom: 1 to: (4 min: self inputKey size).
+firstWord := self inputKey copyFrom: 1 to: (4 min: self inputKey size).
-	nextLetter := self keyAt: self currentIndex + 1.
+nextLetter := self keyAt: currentIndex + 1.
-	(currentWord = 'JOSE' or: [firstWord = 'SAN '])
+(currentWord = 'JOSE' or: [firstWord = 'SAN '])
-	ifTrue: [
+ifTrue: [
-		((self currentIndex = 1 and: [self inputKey size = 4 or: [self inputKey size >= 5 and: [self keyAt: self currentIndex + 4 = $ ]]])
+((currentIndex = 1 and: [self inputKey size = 4 or: [self inputKey size >= 5 and: [self keyAt: currentIndex + 4 = $ ]]])
-			or: [firstWord = 'SAN '])
+or: [firstWord = 'SAN '])
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'H';
+self addPrimaryTranslation: 'H';
-			addSecondaryTranslation: 'H'.
+addSecondaryTranslation: 'H'.
-		] ifFalse: [
+] ifFalse: [
-			self addPrimaryTranslation: 'J';
+self addPrimaryTranslation: 'J';
-			addSecondaryTranslation: 'H'.
+addSecondaryTranslation: 'H'.
-		].
+].
-		^self.
+^self.
-	].
+].
-	(self currentIndex = 1 and: [firstWord ~= 'JOSE'])
+(currentIndex = 1 and: [firstWord ~= 'JOSE'])
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'J';
+self addPrimaryTranslation: 'J';
-		addSecondaryTranslation: 'A'.
+addSecondaryTranslation: 'A'.
-	] ifFalse: [
+] ifFalse: [
-		((self currentIndex > 1 and: [(self keyAt: self currentIndex -1) isVowel])
+((currentIndex > 1 and: [(self keyAt: currentIndex -1) isVowel])
-		and: [(self isSlavoGermanic: self inputKey) not and: [nextLetter = $A or: [nextLetter = $O]]])
+and: [(self isSlavoGermanic: self inputKey) not and: [nextLetter = $A or: [nextLetter = $O]]])
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'J';
+self addPrimaryTranslation: 'J';
-			addSecondaryTranslation: 'H'.
+addSecondaryTranslation: 'H'.
-		] ifFalse: [
+] ifFalse: [
-			currentIndex = self inputKey size
+currentIndex = self inputKey size
-			ifTrue: [
+ifTrue: [
-				self addPrimaryTranslation: 'J';
+self addPrimaryTranslation: 'J';
-				addSecondaryTranslation: ' '.
+addSecondaryTranslation: ' '.
-			] ifFalse: [
+] ifFalse: [
-				((#($L $T $K $S $N $M $B $Z) includes: nextLetter) not and: [(#($S $K $L) includes: (self keyAt: self currentIndex - 1)) not])
+((#($L $T $K $S $N $M $B $Z) includes: nextLetter) not and: [(#($S $K $L) includes: (self keyAt: currentIndex - 1)) not])
-				ifTrue: [
+ifTrue: [
-					self addPrimaryTranslation: 'J';
+self addPrimaryTranslation: 'J';
-					addSecondaryTranslation: 'J'.
+addSecondaryTranslation: 'J'.
-				].
+].
-			].
+].
-		].
+].
-	].
+].
-	nextLetter = $J
+nextLetter = $J
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-	].
+].
 !
 processK
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'K':
+case 'K':
 if(GetAt(current + 1) == 'K')
 current += 2;
 else
 current += 1;
 MetaphAdd(K);
 break;
-	"
+"
-	(self keyAt: self currentIndex + 1) = $K
+(self keyAt: currentIndex + 1) = $K
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1
+self incrementSkipCount: 1
-	].
+].
-	self addPrimaryTranslation: 'K';
+self addPrimaryTranslation: 'K';
-	addSecondaryTranslation: 'K'.
+addSecondaryTranslation: 'K'.
 !
 processL
 "case 'L':
 }else
 current += 1;
 MetaphAdd(L);
 break;
 "
-	| currentWord |
+| currentWord |
-	(self keyAt: self currentIndex + 1) = $L
+(self keyAt: currentIndex + 1) = $L
-	ifTrue: [
+ifTrue: [
-		(((self currentIndex = (self inputKey size - 2))
+(((currentIndex = (self inputKey size - 2))
-		and: [(self currentIndex > 1 and: [#('ILLO' 'ILLA' 'ALLE') includes: (currentWord := self inputKey copyFrom: self currentIndex - 1 to: (self currentIndex + 2 min: self inputKey size))])])
+and: [(currentIndex > 1 and: [#('ILLO' 'ILLA' 'ALLE') includes: (currentWord := self inputKey copyFrom: currentIndex - 1 to: (currentIndex + 2 min: self inputKey size))])])
-		or: [((#('AS' 'OS') includes: (self inputKey copyFrom: self inputKey size - 1 to: self inputKey size)) or: [#($A $O) includes: (self keyAt: self inputKey size)]) and: [currentWord = 'ALLE']
+or: [((#('AS' 'OS') includes: (self inputKey copyFrom: self inputKey size - 1 to: self inputKey size)) or: [#($A $O) includes: (self keyAt: self inputKey size)]) and: [currentWord = 'ALLE']
-			])
+])
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'L';
+self addPrimaryTranslation: 'L';
-			addSecondaryTranslation: ' '.
+addSecondaryTranslation: ' '.
-			^self incrementSkipCount: 1.
+^self incrementSkipCount: 1.
-		].
+].
-		self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-	].
+].
-	self addPrimaryTranslation: 'L';
+self addPrimaryTranslation: 'L';
-	addSecondaryTranslation: 'L'.
+addSecondaryTranslation: 'L'.
 !
 processM
 "case 'M':
 else
 current += 1;
 MetaphAdd(M);
 break;
 "
-	(((self currentIndex > 1 and: [(self inputKey copyFrom: self currentIndex - 1 to: (self currentIndex +1 min: self inputKey size)) = 'UMB'])
+(((currentIndex > 1 and: [(self inputKey copyFrom: currentIndex - 1 to: (currentIndex +1 min: self inputKey size)) = 'UMB'])
-		and: [self currentIndex + 1 = self inputKey size or: [(self inputKey copyFrom: (self currentIndex + 2 min: self inputKey size) to: (self currentIndex + 4 min: self inputKey size)) = 'ER']])
+and: [currentIndex + 1 = self inputKey size or: [(self inputKey copyFrom: (currentIndex + 2 min: self inputKey size) to: (currentIndex + 4 min: self inputKey size)) = 'ER']])
-		or: [(self keyAt: self currentIndex + 1) = $M])
+or: [(self keyAt: currentIndex + 1) = $M])
-		ifTrue: [
+ifTrue: [
-			self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-		].
+].
-		self addPrimaryTranslation: 'M';
+self addPrimaryTranslation: 'M';
-		addSecondaryTranslation: 'M'.
+addSecondaryTranslation: 'M'.
 !
 processN
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'N':
+case 'N':
 if(GetAt(current + 1) == 'N')
 current += 2;
 else
 current += 1;
 MetaphAdd(N);
 break;
-	"
+"
-	(self keyAt: self currentIndex + 1) = $N
+(self keyAt: currentIndex + 1) = $N
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1
+self incrementSkipCount: 1
-	].
+].
-	self addPrimaryTranslation: 'N';
+self addPrimaryTranslation: 'N';
-	addSecondaryTranslation: 'N'.
+addSecondaryTranslation: 'N'.
 !
 processNtilde
 "case '�':
 current += 1;
 self addPrimaryTranslation: 'N';
 addSecondaryTranslation: 'N'.
 !
 processP
-	"case 'P':
+"case 'P':
 if(GetAt(current + 1) == 'H')
 {
 MetaphAdd(F);
 current += 2;
 break;
 else
 current += 1;
 MetaphAdd(P);
 break;
 "
-	| nextLetter |
+| nextLetter |
-	(nextLetter := self keyAt: self currentIndex + 1) = $H
+(nextLetter := self keyAt: currentIndex + 1) = $H
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'F';
+self addPrimaryTranslation: 'F';
-		addSecondaryTranslation: 'F'.
+addSecondaryTranslation: 'F'.
-		^self incrementSkipCount: 1.
+^self incrementSkipCount: 1.
-	].
+].
-	(#($P $B) includes: nextLetter)
+(#($P $B) includes: nextLetter)
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-	] ifFalse: [
+] ifFalse: [
-		self addPrimaryTranslation: 'P';
+self addPrimaryTranslation: 'P';
-		addSecondaryTranslation: 'P'.
+addSecondaryTranslation: 'P'.
-	].
+].
 !
 processQ
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'Q':
+case 'Q':
 if(GetAt(current + 1) == 'Q')
 current += 2;
 else
 current += 1;
 MetaphAdd(K);
 break;
-	"
+"
-	(self keyAt: self currentIndex + 1) = $Q
+(self keyAt: currentIndex + 1) = $Q
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1
+self incrementSkipCount: 1
-	].
+].
-	self addPrimaryTranslation: 'K';
+self addPrimaryTranslation: 'K';
-	addSecondaryTranslation: 'K'.
+addSecondaryTranslation: 'K'.
 !
 processR
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'R':
+case 'R':
 //french e.g. 'rogier', but exclude 'hochmeier'
 if((current == last)
 AND !!SlavoGermanic()
 AND StringAt((current - 2), 2, IE, )
 AND !!StringAt((current - 4), 2, ME, MA, ))
 if(GetAt(current + 1) == 'R')
 current += 2;
 else
 current += 1;
 break;
-	"
+"
-	(self currentIndex = self inputKey size and: [
+(currentIndex = self inputKey size and: [
-		(self isSlavoGermanic: self inputKey) not and: [
+(self isSlavoGermanic: self inputKey) not and: [
-			(self inputKey copyFrom: ((self currentIndex - 2) max: 1) to: ((self currentIndex - 1) max: 1)) = 'IE' and: [
+(self inputKey copyFrom: ((currentIndex - 2) max: 1) to: ((currentIndex - 1) max: 1)) = 'IE' and: [
-				(#('ME' 'MA') includes: (self inputKey copyFrom: ((self currentIndex - 4) max: 1) to: ((self currentIndex - 3) max: 1))) not
+(#('ME' 'MA') includes: (self inputKey copyFrom: ((currentIndex - 4) max: 1) to: ((currentIndex - 3) max: 1))) not
-			]
+]
-		]
+]
-	])
+])
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: '';
+self addPrimaryTranslation: '';
-		addSecondaryTranslation: 'R'.
+addSecondaryTranslation: 'R'.
-	] ifFalse: [
+] ifFalse: [
-		self addPrimaryTranslation: 'R';
+self addPrimaryTranslation: 'R';
-		addSecondaryTranslation: 'R'.
+addSecondaryTranslation: 'R'.
-	].
+].
-	(self keyAt: self currentIndex + 1) = $R
+(self keyAt: currentIndex + 1) = $R
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1
+self incrementSkipCount: 1
-	].
+].
 !
 processRemainingCharacters
 self startIndex to: self inputKey size do:[ :i |
 | c methodSelector |
 ]
 ]
 !
 processS
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'S':
+case 'S':
 //special cases 'island', 'isle', 'carlisle', 'carlysle'
 if(StringAt((current - 1), 3, ISL, YSL, ))
 {
 current += 1;
 break;
 else
 current += 1;
 break;
 "
-	| nextChar char2 chars char |
+| nextChar char2 chars char |
-	(#('ISL' 'YSL') includes: (self inputKey copyFrom: (self currentIndex - 1 max: 1) to: (self currentIndex + 1 min: self inputKey size)))
+(#('ISL' 'YSL') includes: (self inputKey copyFrom: (currentIndex - 1 max: 1) to: (currentIndex + 1 min: self inputKey size)))
-	ifTrue: [
+ifTrue: [
-		^self
+^self
-	].
+].
-	(self currentIndex = 1 and: [(self inputKey copyFrom: 1 to: (5 min: self inputKey size)) = 'SUGAR'])
+(currentIndex = 1 and: [(self inputKey copyFrom: 1 to: (5 min: self inputKey size)) = 'SUGAR'])
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'X';
+self addPrimaryTranslation: 'X';
-		addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-		^self.
+^self.
-	].
+].
-	(self inputKey copyFrom: self currentIndex to: ((self currentIndex + 1) min: self inputKey size)) = 'SH'
+(self inputKey copyFrom: currentIndex to: ((currentIndex + 1) min: self inputKey size)) = 'SH'
-	ifTrue: [
+ifTrue: [
-		(#('HEIM' 'HOEK' 'HOLM' 'HOLZ') includes: (self inputKey copyFrom: (self currentIndex + 1 min: self inputKey size) to: ((self currentIndex + 5) min: self inputKey size)))
+(#('HEIM' 'HOEK' 'HOLM' 'HOLZ') includes: (self inputKey copyFrom: (currentIndex + 1 min: self inputKey size) to: ((currentIndex + 5) min: self inputKey size)))
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-			addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-		] ifFalse: [
+] ifFalse: [
-			self addPrimaryTranslation: 'X';
+self addPrimaryTranslation: 'X';
-			addSecondaryTranslation: 'X'.
+addSecondaryTranslation: 'X'.
-		].
+].
-		^self incrementSkipCount: 1
+^self incrementSkipCount: 1
-	].
+].
-	((#('SIO' 'SIA') includes: (self inputKey copyFrom: self currentIndex to: (self currentIndex + 2 min: self inputKey size)))
+((#('SIO' 'SIA') includes: (self inputKey copyFrom: currentIndex to: (currentIndex + 2 min: self inputKey size)))
-		or: [(self inputKey copyFrom: self currentIndex to: (self currentIndex + 3 min: self inputKey size)) = 'SIAN'])
+or: [(self inputKey copyFrom: currentIndex to: (currentIndex + 3 min: self inputKey size)) = 'SIAN'])
-	ifTrue: [
+ifTrue: [
-		(self isSlavoGermanic: self inputKey) not
+(self isSlavoGermanic: self inputKey) not
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-			addSecondaryTranslation: 'X'.
+addSecondaryTranslation: 'X'.
-		] ifFalse: [
+] ifFalse: [
-			self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-			addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-		].
+].
-		^self incrementSkipCount: 2
+^self incrementSkipCount: 2
-	].
+].
-	((self currentIndex = 1 and: [#($M $N $L $W) includes: (self keyAt: self currentIndex + 1)])
+((currentIndex = 1 and: [#($M $N $L $W) includes: (self keyAt: currentIndex + 1)])
-		or: [(nextChar := self keyAt: self currentIndex + 1) = $Z])
+or: [(nextChar := self keyAt: currentIndex + 1) = $Z])
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-		addSecondaryTranslation: 'X'.
+addSecondaryTranslation: 'X'.
-		nextChar = $Z
+nextChar = $Z
-		ifTrue: [
+ifTrue: [
-			^self incrementSkipCount: 1.
+^self incrementSkipCount: 1.
-		].
+].
-		^self.
+^self.
-	].
+].
-	((self inputKey copyFrom: self currentIndex to: ((self currentIndex + 1) min: self inputKey size)) = 'SC')
+((self inputKey copyFrom: currentIndex to: ((currentIndex + 1) min: self inputKey size)) = 'SC')
-	ifTrue: [
+ifTrue: [
-		(char2 := self keyAt: self currentIndex + 2) = $H
+(char2 := self keyAt: currentIndex + 2) = $H
-		ifTrue: [
+ifTrue: [
-			(#('OO' 'ER' 'EN' 'UY' 'ED' 'EM') includes: (chars := self inputKey copyFrom: ((self currentIndex + 3) min: self inputKey size) to: ((self currentIndex + 4) min: self inputKey size)))
+(#('OO' 'ER' 'EN' 'UY' 'ED' 'EM') includes: (chars := self inputKey copyFrom: ((currentIndex + 3) min: self inputKey size) to: ((currentIndex + 4) min: self inputKey size)))
-			ifTrue: [
+ifTrue: [
-				(#('ER' 'EN') includes: chars)
+(#('ER' 'EN') includes: chars)
-				ifTrue: [
+ifTrue: [
-					self addPrimaryTranslation: 'X';
+self addPrimaryTranslation: 'X';
-					addSecondaryTranslation: 'SK'.
+addSecondaryTranslation: 'SK'.
-				] ifFalse: [
+] ifFalse: [
-					self addPrimaryTranslation: 'SK';
+self addPrimaryTranslation: 'SK';
-					addSecondaryTranslation: 'SK'.
+addSecondaryTranslation: 'SK'.
-				].
+].
-				^self incrementSkipCount: 2.
+^self incrementSkipCount: 2.
-			] ifFalse: [
+] ifFalse: [
-				((self currentIndex = 1 and: [(char := self inputKey at: 4 ifAbsent: [$b]) isVowel not]) and: [char ~= $W])
+((currentIndex = 1 and: [(char := self inputKey at: 4 ifAbsent: [$b]) isVowel not]) and: [char ~= $W])
-				ifTrue: [
+ifTrue: [
-					self addPrimaryTranslation: 'X';
+self addPrimaryTranslation: 'X';
-					addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-				] ifFalse: [
+] ifFalse: [
-					self addPrimaryTranslation: 'X';
+self addPrimaryTranslation: 'X';
-					addSecondaryTranslation: 'X'.
+addSecondaryTranslation: 'X'.
-				].
+].
-				^self incrementSkipCount: 2.
+^self incrementSkipCount: 2.
-			].
+].
-		] ifFalse: [
+] ifFalse: [
-			(#($I $E $Y) includes: char2)
+(#($I $E $Y) includes: char2)
-			ifTrue: [
+ifTrue: [
-				self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-				addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-				^self incrementSkipCount: 2.
+^self incrementSkipCount: 2.
-			] ifFalse: [
+] ifFalse: [
-				self addPrimaryTranslation: 'SK';
+self addPrimaryTranslation: 'SK';
-				addSecondaryTranslation: 'SK'.
+addSecondaryTranslation: 'SK'.
-				^self incrementSkipCount: 2.
+^self incrementSkipCount: 2.
-			]
+]
-		].
+].
-	].
+].
-	(self currentIndex = self inputKey size and: [(#('AI' 'OI') includes: (self inputKey copyFrom: ((self currentIndex - 2) max: 1) to: ((self currentIndex - 1) max: 1)))])
+(currentIndex = self inputKey size and: [(#('AI' 'OI') includes: (self inputKey copyFrom: ((currentIndex - 2) max: 1) to: ((currentIndex - 1) max: 1)))])
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: '';
+self addPrimaryTranslation: '';
-		addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-	] ifFalse: [
+] ifFalse: [
-		self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-		addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-	].
+].
-	(#($S $Z) includes: (self keyAt: self currentIndex + 1))
+(#($S $Z) includes: (self keyAt: currentIndex + 1))
-	ifTrue: [
+ifTrue: [
-		^self incrementSkipCount: 1.
+^self incrementSkipCount: 1.
-	].
+].
 !
 processT
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'T':
+case 'T':
 if(StringAt(current, 4, TION, ))
 {
 MetaphAdd(X);
 current += 3;
 break;
 else
 current += 1;
 MetaphAdd(T);
 break;
 "
-	((self inputKey copyFrom: self currentIndex to: ((self currentIndex + 3) min: self inputKey size)) = 'TION')
+((self inputKey copyFrom: currentIndex to: ((currentIndex + 3) min: self inputKey size)) = 'TION')
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'X';
+self addPrimaryTranslation: 'X';
-		addSecondaryTranslation: 'X'.
+addSecondaryTranslation: 'X'.
-		^self incrementSkipCount: 2.
+^self incrementSkipCount: 2.
-	].
+].
-	(#('TIA' 'TCH') includes: (self inputKey copyFrom: self currentIndex to: ((self currentIndex + 2) min: self inputKey size)))
+(#('TIA' 'TCH') includes: (self inputKey copyFrom: currentIndex to: ((currentIndex + 2) min: self inputKey size)))
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'X';
+self addPrimaryTranslation: 'X';
-		addSecondaryTranslation: 'X'.
+addSecondaryTranslation: 'X'.
-		^self incrementSkipCount: 2.
+^self incrementSkipCount: 2.
-	].
+].
-	(((self inputKey copyFrom: self currentIndex to: ((self currentIndex + 1) min: self inputKey size)) = 'TH') or: [
+(((self inputKey copyFrom: currentIndex to: ((currentIndex + 1) min: self inputKey size)) = 'TH') or: [
-		((self inputKey copyFrom: self currentIndex to: ((self currentIndex + 2) min: self inputKey size)) = 'TTH')
+((self inputKey copyFrom: currentIndex to: ((currentIndex + 2) min: self inputKey size)) = 'TTH')
-	])
+])
-	ifTrue: [
+ifTrue: [
-		((#('OM' 'AM') includes: (self inputKey copyFrom: self currentIndex + 2 to: ((self currentIndex + 3) min: self inputKey size)))
+((#('OM' 'AM') includes: (self inputKey copyFrom: currentIndex + 2 to: ((currentIndex + 3) min: self inputKey size)))
-		or: [(#('VAN ' 'VON ') includes: (self inputKey copyFrom: 1 to: (4 min: self inputKey size)))
+or: [(#('VAN ' 'VON ') includes: (self inputKey copyFrom: 1 to: (4 min: self inputKey size)))
-			or: [(self inputKey copyFrom: 1 to: (3 min: self inputKey size)) = 'SCH']
+or: [(self inputKey copyFrom: 1 to: (3 min: self inputKey size)) = 'SCH']
-			])
+])
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'T';
+self addPrimaryTranslation: 'T';
-			addSecondaryTranslation: 'T'.
+addSecondaryTranslation: 'T'.
-		] ifFalse: [
+] ifFalse: [
-			self addPrimaryTranslation: '0';
+self addPrimaryTranslation: '0';
-			addSecondaryTranslation: 'T'.
+addSecondaryTranslation: 'T'.
-		].
+].
-		^self incrementSkipCount: 1.
+^self incrementSkipCount: 1.
-	].
+].
-	(#($T $D) includes: (self keyAt: self currentIndex + 1))
+(#($T $D) includes: (self keyAt: currentIndex + 1))
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1.
+self incrementSkipCount: 1.
-	].
+].
-	self addPrimaryTranslation: 'T';
+self addPrimaryTranslation: 'T';
-	addSecondaryTranslation: 'T'.
+addSecondaryTranslation: 'T'.
 !
 processV
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'V':
+case 'V':
 if(GetAt(current + 1) == 'V')
 current += 2;
 else
 current += 1;
 MetaphAdd(F);
 break;
-	"
+"
-	(self keyAt: self currentIndex + 1) = $V
+(self keyAt: currentIndex + 1) = $V
-	ifTrue: [
+ifTrue: [
-		self incrementSkipCount: 1
+self incrementSkipCount: 1
-	].
+].
-	self addPrimaryTranslation: 'F';
+self addPrimaryTranslation: 'F';
-	addSecondaryTranslation: 'F'.
+addSecondaryTranslation: 'F'.
 !
 processW
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'W':
+case 'W':
 //can also be in middle of word
 if(StringAt(current, 2, WR, ))
 {
 MetaphAdd(R);
 current += 2;
 //Arnow should match Arnoff
 if(((current == last) AND IsVowel(current - 1))
 OR StringAt((current - 1), 5, EWSKI, EWSKY, OWSKI, OWSKY, )
 OR StringAt(0, 3, SCH, ))
-				  {
+{
 MetaphAdd(, F);
 current +=1;
 break;
 }
 //else skip it
 current +=1;
 break;
 "
-	| word nextLetter |
+| word nextLetter |
-	((word := self inputKey copyFrom: self currentIndex to: (self currentIndex + 1 min: self inputKey size)) = 'WR')
+((word := self inputKey copyFrom: currentIndex to: (currentIndex + 1 min: self inputKey size)) = 'WR')
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'R';
+self addPrimaryTranslation: 'R';
-		addSecondaryTranslation: 'R'.
+addSecondaryTranslation: 'R'.
-		^self incrementSkipCount: 1
+^self incrementSkipCount: 1
-	].
+].
-	((self currentIndex = 1 and: [(nextLetter := self keyAt: self currentIndex + 1) isVowel]) or: [
+((currentIndex = 1 and: [(nextLetter := self keyAt: currentIndex + 1) isVowel]) or: [
-		word = 'WH'
+word = 'WH'
-	])
+])
-	ifTrue: [
+ifTrue: [
-		nextLetter isVowel
+nextLetter isVowel
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'A';
+self addPrimaryTranslation: 'A';
-			addSecondaryTranslation: 'F'.
+addSecondaryTranslation: 'F'.
-		] ifFalse: [
+] ifFalse: [
-			self addPrimaryTranslation: 'A';
+self addPrimaryTranslation: 'A';
-			addSecondaryTranslation: 'A'.
+addSecondaryTranslation: 'A'.
-		]
+]
-	].
+].
-	((((self currentIndex = self inputKey size) and: [(self keyAt: self currentIndex - 1) isVowel])
+((((currentIndex = self inputKey size) and: [(self keyAt: currentIndex - 1) isVowel])
-		or: [#('EWSKI' 'EWSKY' 'OWSKI' 'OWSKY') includes: (self inputKey copyFrom: ((self currentIndex - 1) max: 1) to: (self currentIndex + 3 min: self inputKey size))])
+or: [#('EWSKI' 'EWSKY' 'OWSKI' 'OWSKY') includes: (self inputKey copyFrom: ((currentIndex - 1) max: 1) to: (currentIndex + 3 min: self inputKey size))])
-			or: [(self inputKey copyFrom: 1 to: 3) = 'SCH'])
+or: [(self inputKey copyFrom: 1 to: 3) = 'SCH'])
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: '';
+self addPrimaryTranslation: '';
-		addSecondaryTranslation: 'F'.
+addSecondaryTranslation: 'F'.
-		^self.
+^self.
-	].
+].
-	(#('WICZ' 'WITZ') includes: (self inputKey copyFrom: self currentIndex to: (self currentIndex + 4 min: self inputKey size)))
+(#('WICZ' 'WITZ') includes: (self inputKey copyFrom: currentIndex to: (currentIndex + 4 min: self inputKey size)))
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'TS';
+self addPrimaryTranslation: 'TS';
-		addSecondaryTranslation: 'FX'.
+addSecondaryTranslation: 'FX'.
-		^self incrementSkipCount: 3
+^self incrementSkipCount: 3
-	].
+].
 !
 processX
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'X':
+case 'X':
 //french e.g. breaux
 if(!!((current == last)
 AND (StringAt((current - 3), 3, IAU, EAU, )
 OR StringAt((current - 2), 2, AU, OU, ))) )
 MetaphAdd(KS);
 current += 1;
 break;
 "
-	((self currentIndex = self inputKey size) and: [(#('IAU' 'EAU') includes: (self inputKey copyFrom: ((self currentIndex - 3) min: 1) to: self currentIndex)) or: [(#('AU' 'OU') includes: (self inputKey copyFrom: ((self currentIndex - 2) min: 1) to: self currentIndex))]]) not
+((currentIndex = self inputKey size) and: [(#('IAU' 'EAU') includes: (self inputKey copyFrom: ((currentIndex - 3) min: 1) to: currentIndex)) or: [(#('AU' 'OU') includes: (self inputKey copyFrom: ((currentIndex - 2) min: 1) to: currentIndex))]]) not
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'KS';
+self addPrimaryTranslation: 'KS';
-		addSecondaryTranslation: 'KS'.
+addSecondaryTranslation: 'KS'.
-	].
+].
-	(#($C $X) includes: (self keyAt: self currentIndex + 1))
+(#($C $X) includes: (self keyAt: currentIndex + 1))
-	ifTrue: [
+ifTrue: [
-		^self incrementSkipCount: 1
+^self incrementSkipCount: 1
-	]
+]
 !
 processZ
-	"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
+"http://aspell.sourceforge.net/metaphone/dmetaph.cpp
-	case 'Z':
+case 'Z':
 //chinese pinyin e.g. 'zhao'
 if(GetAt(current + 1) == 'H')
 {
 MetaphAdd(J);
 current += 2;
 else
 current += 1;
 break;
 "
-	(self keyAt: self currentIndex + 1) = $H
+(self keyAt: currentIndex + 1) = $H
-	ifTrue: [
+ifTrue: [
-		self addPrimaryTranslation: 'J';
+self addPrimaryTranslation: 'J';
-		addSecondaryTranslation: 'J'.
+addSecondaryTranslation: 'J'.
-		^self incrementSkipCount: 1
+^self incrementSkipCount: 1
-	] ifFalse: [
+] ifFalse: [
-		((#('ZO' 'ZI' 'ZA') includes: (self inputKey copyFrom: ((self currentIndex + 1) min: self inputKey size) to: ((self currentIndex + 2) min: self inputKey size))) or: [
+((#('ZO' 'ZI' 'ZA') includes: (self inputKey copyFrom: ((currentIndex + 1) min: self inputKey size) to: ((currentIndex + 2) min: self inputKey size))) or: [
-			(self isSlavoGermanic: self inputKey) and: [(self currentIndex > 1 and: [(self keyAt: self currentIndex - 1) ~= 'T'])]
+(self isSlavoGermanic: self inputKey) and: [(currentIndex > 1 and: [(self keyAt: currentIndex - 1) ~= 'T'])]
-		])
+])
-		ifTrue: [
+ifTrue: [
-			self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-			addSecondaryTranslation: 'TS'.
+addSecondaryTranslation: 'TS'.
-		] ifFalse: [
+] ifFalse: [
-			self addPrimaryTranslation: 'S';
+self addPrimaryTranslation: 'S';
-			addSecondaryTranslation: 'S'.
+addSecondaryTranslation: 'S'.
-		].
+].
-		(self keyAt: self currentIndex + 1) = $Z
+(self keyAt: currentIndex + 1) = $Z
-		ifTrue: [
+ifTrue: [
-			^self incrementSkipCount: 1
+^self incrementSkipCount: 1
-		].
+].
-	]
+]
 ! !
 !PhoneticStringUtilities::MiracodeStringComparator class methodsFor:'documentation'!
 documentation
 ! !
 !PhoneticStringUtilities class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic2/PhoneticStringUtilities.st,v 1.6 2009-08-12 18:26:40 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic2/PhoneticStringUtilities.st,v 1.7 2009-08-16 10:02:50 cg Exp $'
 ! !

changeset 2213	d465fa29df0e
parent 2211	42fe8fe39e9c
child 2215	c1f072a78366