Merge pull request #811 from zonble/master

Enhance candidate state handling for Plain Bopomofo input mode

Author: zonble

Source/Data/BPMFPunctuations.txt

@@ -563,7 +563,7 @@ _ _half_punctuation_HanyuPinyin__ 0.0
 ＝ _punctuation_list_+ 0.0
 ＝ _punctuation_list_= 0.0
 ＼ _punctuation_list_\ 0.0
-／ _punctuation_list_\ 0.0
+／ _punctuation_list_/ 0.0
 — _punctuation_list__ 0.0
 … _punctuation_list__ 0.0
 － _punctuation_list__ 0.0

Source/Data/associated-punctuation.txt

@@ -41,3 +41,15 @@
 ︽-_punctuation_Hsu_<-︾-_punctuation_Hsu_> -4
 （-_punctuation_(-）-_punctuation_) -4
 〈-_punctuation_HanyuPinyin_<-〉-_punctuation_HanyuPinyin_> -4
+「-_punctuation_list_[-」-_punctuation_list_] -4
+『-_punctuation_list_{-』-_punctuation_list_} -4
+《-_punctuation_list_{-》-_punctuation_list_} -4
+〔-_punctuation_list_{-〕-_punctuation_list_} -4
+｛-_punctuation_list_{-｝-_punctuation_list_} -4
+〈-_punctuation_list_{-〉-_punctuation_list_} -4
+【-_punctuation_list_{-】-_punctuation_list_} -4
+〖-_punctuation_list_{-〗-_punctuation_list_} -4
+〈-_punctuation_list_<-〉-_punctuation_list_> -4
+《-_punctuation_list_<-》-_punctuation_list_> -4
+︿-_punctuation_list_<-﹀-_punctuation_list_> -4
+︽-_punctuation_list_<-︾-_punctuation_list_> -4

Source/KeyHandler.mm

@@ -1403,8 +1403,21 @@ - (BOOL)_handleCandidateState:(InputState *)state
             }
             _grid->insertReading(key);
             [self _walk];
-            InputStateInputting *inputting = (InputStateInputting *)[self buildInputtingState];
-            stateCallback(inputting);
+            if (_inputMode == InputModePlainBopomofo) {
+                InputStateChoosingCandidate *candidateState = [self _buildCandidateStateFromInputtingState:(InputStateInputting *)[self buildInputtingState] useVerticalMode:input.useVerticalMode];
+                if (candidateState.candidates.count == 1) {
+                    [self clear];
+                    InputStateCommitting *committing = [[InputStateCommitting alloc] initWithPoppedText:candidateState.candidates.firstObject.value];
+                    stateCallback(committing);
+                    InputStateEmpty *empty = [[InputStateEmpty alloc] init];
+                    stateCallback(empty);
+                } else {
+                    stateCallback(candidateState);
+                }
+            } else {
+                InputStateInputting *inputting = (InputStateInputting *)[self buildInputtingState];
+                stateCallback(inputting);
+            }
             return YES;
         }
     }