Improve Telex 2 handling

luongthanhlam · luongthanhlam · commit 4ad063f3d708 · 2019-12-10T21:55:27.000+07:00
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 engine_name=bamboo
 ibus_e_name=ibus-engine-$(engine_name)
 pkg_name=ibus-$(engine_name)
-version=0.6.2
+version=0.6.3
 
 engine_dir=/usr/share/$(pkg_name)
 ibus_dir=/usr/share/ibus
diff --git a/archlinux/PKGBUILD-git b/archlinux/PKGBUILD-git
@@ -17,7 +17,7 @@
 #
 # Maintainer: Luong Thanh Lam <ltlam93@gmail.com>
 pkgname=ibus-bamboo-git
-pkgver=0.6.2
+pkgver=0.6.3
 pkgrel=1
 pkgdesc='A Vietnamese IME for IBus'
 arch=(any)
diff --git a/archlinux/PKGBUILD-release b/archlinux/PKGBUILD-release
@@ -17,7 +17,7 @@
 #
 # Maintainer: Luong Thanh Lam <ltlam93@gmail.com>
 pkgname=ibus-bamboo
-pkgver=0.6.2
+pkgver=0.6.3
 pkgrel=1
 pkgdesc='A Vietnamese IME for IBus'
 arch=(any)
diff --git a/bamboo.xml b/bamboo.xml
@@ -22,7 +22,7 @@
     <name>org.freedesktop.IBus.bamboo</name>
     <description>Vietnamese input engine for IBus</description>
     <exec>/usr/lib/ibus-engine-bamboo --ibus</exec>
-    <version>0.6.2</version>
+    <version>0.6.3</version>
     <author>Luong Thanh Lam &lt;ltlam93@gmail.com&gt;</author>
     <license>GPLv3</license>
     <homepage>https://github.com/BambooEngine/ibus-bamboo/</homepage>
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+ibus-bamboo (0.6.3-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Luong Thanh Lam <ltlam93@gmail.com>  Tue, 10 Dec 2019 21:54:11 +0700
+
 ibus-bamboo (0.6.2-1) stable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
@@ -20,7 +20,7 @@ Section: utils
 Priority: extra
 Maintainer: Luong Thanh Lam <ltlam93@gmail.com>
 Build-Depends: debhelper, golang, libx11-dev, libxtst-dev
-Standards-Version: 0.6.2
+Standards-Version: 0.6.3
 Homepage: https://github.com/BambooEngine/ibus-bamboo
 
 Package: ibus-bamboo
diff --git a/ibus-bamboo.dsc b/ibus-bamboo.dsc
@@ -4,12 +4,12 @@ Format: 1.0
 Source: ibus-bamboo
 Binary: ibus-bamboo
 Architecture: any
-Version: 0.6.2-0
+Version: 0.6.3-0
 Maintainer: Luong Thanh Lam <ltlam93@gmail.com>
 Homepage: https://github.com/BambooEngine/ibus-bamboo
 Build-Depends: debhelper, golang, libx11-dev, libxt-dev, libxtst-dev
 Files:
- 0 0 ibus-bamboo-0.6.2.tar.gz
+ 0 0 ibus-bamboo-0.6.3.tar.gz
 
 -----BEGIN PGP SIGNATURE-----
 
diff --git a/ibus-bamboo.spec b/ibus-bamboo.spec
@@ -4,7 +4,7 @@
 %define ibus_comp_dir /usr/share/ibus/component
 
 Name: ibus-bamboo
-Version: 0.6.2
+Version: 0.6.3
 Release: 1%{?dist}
 Summary: A Vietnamese input method for IBus
 
diff --git a/src/github.com/BambooEngine/bamboo-core/bamboo.go b/src/github.com/BambooEngine/bamboo-core/bamboo.go
@@ -21,9 +21,8 @@ const (
 	ToneLess
 	MarkLess
 	LowerCase
-	WithEffectKeys
-	InReverseOrder
 	FullText
+	InReverseOrder
 )
 
 const (
@@ -91,18 +90,16 @@ func (e *BambooEngine) isEffectiveKey(key rune) bool {
 }
 
 func (e *BambooEngine) IsValid(inputIsFullComplete bool) bool {
-	var _, last = extractLastWord(e.composition, e.inputMethod.Keys)
+	var _, last = extractLastWord(e.composition, e.GetInputMethod().Keys)
 	return isValid(last, inputIsFullComplete)
 }
 
 func (e *BambooEngine) GetProcessedString(mode Mode) string {
 	var tmp []*Transformation
 	if mode&FullText != 0 {
 		tmp = e.composition
-	} else if mode&WithEffectKeys != 0 {
-		_, tmp = extractLastWord(e.composition, e.inputMethod.Keys)
 	} else {
-		_, tmp = extractLastWord(e.composition, nil)
+		_, tmp = extractLastWord(e.composition, e.inputMethod.Keys)
 	}
 	return Flatten(tmp, mode)
 }
@@ -202,7 +199,7 @@ func (e *BambooEngine) ProcessKey(key rune, mode Mode) {
 }
 
 func (e *BambooEngine) RestoreLastWord() {
-	var previous, lastComb = extractLastWord(e.composition, e.inputMethod.Keys)
+	var previous, lastComb = extractLastWord(e.composition, e.GetInputMethod().Keys)
 	if len(lastComb) == 0 {
 		return
 	}
@@ -224,7 +221,7 @@ func (e *BambooEngine) RemoveLastChar(refreshLastToneTarget bool) {
 		e.composition = e.composition[:len(e.composition)-1]
 		return
 	}
-	var previous, lastComb = extractLastWord(e.composition, e.inputMethod.Keys)
+	var previous, lastComb = extractLastWord(e.composition, e.GetInputMethod().Keys)
 	var newComb []*Transformation
 	for _, t := range lastComb {
 		if t.Target == lastAppending || t == lastAppending {
diff --git a/src/github.com/BambooEngine/bamboo-core/bamboo_test.go b/src/github.com/BambooEngine/bamboo-core/bamboo_test.go
@@ -164,24 +164,24 @@ func TestTelex23(t *testing.T) {
 	ng = newStdEngine()
 	ng.ProcessString("t ]", EnglishMode)
 	ng.ProcessString("a", VietnameseMode)
-  if ng.GetProcessedString(VietnameseMode) != "a" || !ng.IsValid(false) {
-    t.Errorf("Process ]aa, got %s valid=%v expected true", ng.GetProcessedString(VietnameseMode), ng.IsValid(true))
-  }
+	if ng.GetProcessedString(VietnameseMode) != "]a" {
+		t.Errorf("Process t ]a, got %s valid=%v expected true", ng.GetProcessedString(VietnameseMode), ng.IsValid(false))
+	}
 	ng.Reset()
 	ng.ProcessString("]]a", VietnameseMode)
-  if ng.GetProcessedString(VietnameseMode) != "a" || !ng.IsValid(false) {
-    t.Errorf("Process ]aa, got %s valid=%v expected true", ng.GetProcessedString(VietnameseMode), ng.IsValid(true))
-  }
-	var im = ParseInputMethod(InputMethodDefinitions, "Telex 3")
+	if ng.GetProcessedString(VietnameseMode) != "]a" {
+		t.Errorf("Process ]aa, got %s valid=%v expected true", ng.GetProcessedString(VietnameseMode), ng.IsValid(true))
+	}
+	var im = ParseInputMethod(InputMethodDefinitions, "Telex 2")
 	var ng = NewEngine(im, EstdFlags)
 	ng.ProcessString("[", VietnameseMode)
-	if ng.GetProcessedString(VietnameseMode) != "ươ" {
-		t.Errorf("Process Telex 3 [[], got [%v] expected [ươ]", ng.GetProcessedString(VietnameseMode))
+	if ng.GetProcessedString(VietnameseMode) != "ơ" {
+		t.Errorf("Process Telex 2 [[], got [%v] expected [ươ]", ng.GetProcessedString(VietnameseMode))
 	}
 	ng.Reset()
 	ng.ProcessString("{", VietnameseMode)
-	if ng.GetProcessedString(VietnameseMode) != "ƯƠ" {
-		t.Errorf("Process Telex 3 [{], got [%s] expected [ƯƠ]", ng.GetProcessedString(EnglishMode))
+	if ng.GetProcessedString(VietnameseMode) != "Ơ" {
+		t.Errorf("Process Telex 2 [{], got [%s] expected [Ơ]", ng.GetProcessedString(VietnameseMode))
 	}
 }
 
@@ -238,7 +238,7 @@ func TestSpellingCheckForGiw(t *testing.T) {
 func TestDoubleBrackets(t *testing.T) {
 	ng := newStdEngine()
 	ng.ProcessString("[[", VietnameseMode)
-	if ng.GetProcessedString(EnglishMode|WithEffectKeys) != "[" {
+	if ng.GetProcessedString(EnglishMode) != "[" {
 		t.Errorf("TestDoubleBrackets, got [%v] expected [%v]", ng.GetProcessedString(EnglishMode), "[")
 	}
 }
@@ -398,8 +398,8 @@ func TestProcessTo5(t *testing.T) {
 	var im = ParseInputMethod(InputMethodDefinitions, "VNI")
 	ng := NewEngine(im, EstdFlags)
 	ng.ProcessString("o55", VietnameseMode)
-	if ng.GetProcessedString(VietnameseMode|WithEffectKeys) != "o5" {
-		t.Errorf("Process [o55-VNI], got [%v] expected [o5]", ng.GetProcessedString(VietnameseMode|WithEffectKeys))
+	if ng.GetProcessedString(VietnameseMode) != "o5" {
+		t.Errorf("Process [o55-VNI], got [%v] expected [o5]", ng.GetProcessedString(VietnameseMode))
 	}
 }
 
@@ -445,18 +445,18 @@ func TestBambooEngine_RestoreLastWord_TCVN(t *testing.T) {
 	var im = ParseInputMethod(InputMethodDefinitions, "Microsoft layout")
 	ng := NewEngine(im, EstdFlags)
 	ng.ProcessString("112", VietnameseMode)
-	if ng.GetProcessedString(VietnameseMode|WithEffectKeys) != "1â" {
-		t.Errorf("Process-VIE 112 (Microsoft layout), got [%v] expected [1â]", ng.GetProcessedString(VietnameseMode|WithEffectKeys))
+	if ng.GetProcessedString(VietnameseMode) != "1â" {
+		t.Errorf("Process-VIE 112 (Microsoft layout), got [%v] expected [1â]", ng.GetProcessedString(VietnameseMode))
 	}
 	ng.RestoreLastWord()
-	if ng.GetProcessedString(EnglishMode|WithEffectKeys) != "12" {
-		t.Errorf("Process-ENG 112 (Microsoft layout), got [%v] expected [12]", ng.GetProcessedString(EnglishMode|WithEffectKeys))
+	if ng.GetProcessedString(EnglishMode) != "12" {
+		t.Errorf("Process-ENG 112 (Microsoft layout), got [%v] expected [12]", ng.GetProcessedString(EnglishMode))
 	}
 	ng.Reset()
 	ng.ProcessString("d[]ng9 t4i", VietnameseMode)
 	ng.RestoreLastWord()
-	if ng.GetProcessedString(VietnameseMode|WithEffectKeys) != "t4i" {
-		t.Errorf("Process [duongwj t4i - MS layout], got [%v] expected [t4i]", ng.GetProcessedString(VietnameseMode|WithEffectKeys))
+	if ng.GetProcessedString(VietnameseMode) != "t4i" {
+		t.Errorf("Process [duongwj t4i - MS layout], got [%v] expected [t4i]", ng.GetProcessedString(VietnameseMode))
 	}
 }
 
@@ -589,13 +589,13 @@ func TestDoubleTyping(t *testing.T) {
 	ng.Reset()
 	ng.ProcessString("[[", VietnameseMode)
 	ng.ProcessString("oo", VietnameseMode)
-	if ng.GetProcessedString(VietnameseMode|WithEffectKeys) != "[ô" {
-		t.Errorf("Process [oo, got %s expected [ô", ng.GetProcessedString(VietnameseMode|WithEffectKeys))
+	if ng.GetProcessedString(VietnameseMode) != "[ô" {
+		t.Errorf("Process [oo, got %s expected [ô", ng.GetProcessedString(VietnameseMode))
 	}
 	ng.Reset()
 	ng.ProcessString("oo]", VietnameseMode)
-	if ng.GetProcessedString(VietnameseMode|WithEffectKeys) != "ô]" {
-		t.Errorf("Process oo], got %s expected ô]", ng.GetProcessedString(VietnameseMode|WithEffectKeys))
+	if ng.GetProcessedString(VietnameseMode) != "ôư" {
+		t.Errorf("Process oo], got %s expected ôư", ng.GetProcessedString(VietnameseMode))
 	}
 	ng.Reset()
 	ng.ProcessString("chury", VietnameseMode)
@@ -639,9 +639,9 @@ func TestDoubleTyping(t *testing.T) {
 	}
 	ng.Reset()
 	ng.ProcessString("tôi）t", EnglishMode)
-  if ng.GetProcessedString(VietnameseMode) != "t" {
-    t.Errorf("Process [tôi）t], got %s expected t", ng.GetProcessedString(VietnameseMode))
-  }
+	if ng.GetProcessedString(VietnameseMode) != "t" {
+		t.Errorf("Process [tôi）t], got %s expected t", ng.GetProcessedString(VietnameseMode))
+	}
 	log.Print("===============end")
 	ng.Reset()
 }
diff --git a/src/github.com/BambooEngine/bamboo-core/bamboo_utils.go b/src/github.com/BambooEngine/bamboo-core/bamboo_utils.go
@@ -243,12 +243,12 @@ func extractCvcTrans(composition []*Transformation) ([]*Transformation, []*Trans
 
 func extractLastWord(composition []*Transformation, effectKeys []rune) ([]*Transformation, []*Transformation) {
 	for i := len(composition) - 1; i >= 0; i-- {
-		var canvas = getCanvas(composition[i:], VietnameseMode|LowerCase)
+		var canvas = getCanvas(composition[i:], VietnameseMode|LowerCase|ToneLess|MarkLess)
 		if len(canvas) == 0 {
 			continue
 		}
-		var key = canvas[0]
-		if !canProcessKey(key, effectKeys) {
+		var c = canvas[0]
+		if !IsAlpha(c) && !inKeyList(effectKeys, c) {
 			if i == len(composition)-1 {
 				return composition, nil
 			}
@@ -464,9 +464,6 @@ func generateFallbackTransformations(composition []*Transformation, applicableRu
 			IsUpperCase: _isUpperCase,
 		})
 	}
-	if composition != nil && IsPunctuationMark(trans.Rule.Key) && !isValid(append(composition, transformations...), false) {
-		transformations = []*Transformation{newAppendingTrans(lowerKey, isUpperCase)}
-	}
 	return transformations
 }
 
diff --git a/src/github.com/BambooEngine/bamboo-core/charset_def.go b/src/github.com/BambooEngine/bamboo-core/charset_def.go
@@ -7,6 +7,7 @@
  */
 
 package bamboo
+
 type charsetDefinition map[rune]string
 
 var charsetDefinitions = map[string]charsetDefinition{
diff --git a/src/github.com/BambooEngine/bamboo-core/flattener.go b/src/github.com/BambooEngine/bamboo-core/flattener.go
@@ -7,6 +7,7 @@
  */
 
 package bamboo
+
 import (
 	"unicode"
 )
diff --git a/src/github.com/BambooEngine/bamboo-core/rules_parser.go b/src/github.com/BambooEngine/bamboo-core/rules_parser.go
@@ -80,12 +80,12 @@ func (r *Rule) GetMark() Mark {
 }
 
 type InputMethod struct {
-	Name      string
-	Rules     []Rule
-	SuperKeys []rune
-	ToneKeys  []rune
-	AppendingKeys  []rune
-	Keys      []rune
+	Name          string
+	Rules         []Rule
+	SuperKeys     []rune
+	ToneKeys      []rune
+	AppendingKeys []rune
+	Keys          []rune
 }
 
 func ParseInputMethod(imDef map[string]InputMethodDefinition, imName string) InputMethod {
@@ -113,14 +113,14 @@ func parseInputMethods(imDef map[string]InputMethodDefinition) map[string]InputM
 			}
 			im.Keys = append(im.Keys, key)
 		}
-    for _, rule := range im.Rules {
-      if rule.EffectType == Appending {
-        im.AppendingKeys = append(im.AppendingKeys, rule.Key)
-      }
-      if rule.EffectType == ToneTransformation {
-        im.ToneKeys = append(im.ToneKeys, rule.Key)
-      }
-    }
+		for _, rule := range im.Rules {
+			if rule.EffectType == Appending {
+				im.AppendingKeys = append(im.AppendingKeys, rule.Key)
+			}
+			if rule.EffectType == ToneTransformation {
+				im.ToneKeys = append(im.ToneKeys, rule.Key)
+			}
+		}
 		inputMethods[name] = im
 	}
 	return inputMethods
diff --git a/src/ibus-bamboo/engine_backspace.go b/src/ibus-bamboo/engine_backspace.go
diff --git a/src/ibus-bamboo/engine_preedit.go b/src/ibus-bamboo/engine_preedit.go
diff --git a/src/ibus-bamboo/engine_utils.go b/src/ibus-bamboo/engine_utils.go

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#`
`18`	`18`	`# Maintainer: Luong Thanh Lam <ltlam93@gmail.com>`
`19`	`19`	`pkgname=ibus-bamboo-git`
`20`		`-pkgver=0.6.2`
	`20`	`+pkgver=0.6.3`
`21`	`21`	`pkgrel=1`
`22`	`22`	`pkgdesc='A Vietnamese IME for IBus'`
`23`	`23`	`arch=(any)`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,8 @@ const (`
`21`	`21`	`ToneLess`
`22`	`22`	`MarkLess`
`23`	`23`	`LowerCase`
`24`		`- WithEffectKeys`
`25`		`- InReverseOrder`
`26`	`24`	`FullText`
	`25`	`+ InReverseOrder`
`27`	`26`	`)`
`28`	`27`
`29`	`28`	`const (`
`@@ -91,18 +90,16 @@ func (e *BambooEngine) isEffectiveKey(key rune) bool {`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`func (e *BambooEngine) IsValid(inputIsFullComplete bool) bool {`
`94`		`- var _, last = extractLastWord(e.composition, e.inputMethod.Keys)`
	`93`	`+ var _, last = extractLastWord(e.composition, e.GetInputMethod().Keys)`
`95`	`94`	`return isValid(last, inputIsFullComplete)`
`96`	`95`	`}`
`97`	`96`
`98`	`97`	`func (e *BambooEngine) GetProcessedString(mode Mode) string {`
`99`	`98`	`var tmp []*Transformation`
`100`	`99`	`if mode&FullText != 0 {`
`101`	`100`	`tmp = e.composition`
`102`		`- } else if mode&WithEffectKeys != 0 {`
`103`		`- _, tmp = extractLastWord(e.composition, e.inputMethod.Keys)`
`104`	`101`	`} else {`
`105`		`- _, tmp = extractLastWord(e.composition, nil)`
	`102`	`+ _, tmp = extractLastWord(e.composition, e.inputMethod.Keys)`
`106`	`103`	`}`
`107`	`104`	`return Flatten(tmp, mode)`
`108`	`105`	`}`
`@@ -202,7 +199,7 @@ func (e *BambooEngine) ProcessKey(key rune, mode Mode) {`
`202`	`199`	`}`
`203`	`200`
`204`	`201`	`func (e *BambooEngine) RestoreLastWord() {`
`205`		`- var previous, lastComb = extractLastWord(e.composition, e.inputMethod.Keys)`
	`202`	`+ var previous, lastComb = extractLastWord(e.composition, e.GetInputMethod().Keys)`
`206`	`203`	`if len(lastComb) == 0 {`
`207`	`204`	`return`
`208`	`205`	`}`
`@@ -224,7 +221,7 @@ func (e *BambooEngine) RemoveLastChar(refreshLastToneTarget bool) {`
`224`	`221`	`e.composition = e.composition[:len(e.composition)-1]`
`225`	`222`	`return`
`226`	`223`	`}`
`227`		`- var previous, lastComb = extractLastWord(e.composition, e.inputMethod.Keys)`
	`224`	`+ var previous, lastComb = extractLastWord(e.composition, e.GetInputMethod().Keys)`
`228`	`225`	`var newComb []*Transformation`
`229`	`226`	`for _, t := range lastComb {`
`230`	`227`	`if t.Target == lastAppending \|\| t == lastAppending {`