Add some half chars in PunctTable

diff --git a/scripts/punct.py b/scripts/punct.py
index b67e838..92bb144 100644 (file)
--- a/scripts/punct.py
+++ b/scripts/punct.py
@@ -18,16 +18,16 @@ punct_map = (
     (u'-', (u'…', u'—', u'－', u'¯', u'﹉', u'￣', u'﹊', u'ˍ', u'–', u'‥',)),
     (u'.', (u'。', u'·', u'‧', u'﹒', u'．',)),
     (u'/', (u'／', u'÷', u'↗', u'↙', u'∕',)),
-    (u'0', (u'０',)),
-    (u'1', (u'１',)),
-    (u'2', (u'２',)),
-    (u'3', (u'３',)),
-    (u'4', (u'４',)),
-    (u'5', (u'５',)),
-    (u'6', (u'６',)),
-    (u'7', (u'７',)),
-    (u'8', (u'８',)),
-    (u'9', (u'９',)),
+    (u'0', (u'０', u'0')),
+    (u'1', (u'１', u'1')),
+    (u'2', (u'２', u'2')),
+    (u'3', (u'３', u'3')),
+    (u'4', (u'４', u'4')),
+    (u'5', (u'５', u'5')),
+    (u'6', (u'６', u'6')),
+    (u'7', (u'７', u'7')),
+    (u'8', (u'８', u'8')),
+    (u'9', (u'９', u'9')),
     (u':', (u'：', u'︰', u'﹕',)),
     (u';', (u'；', u'﹔',)),
     (u'<', (u'＜', u'〈', u'《', u'︽', u'︿', u'﹤',)),
@@ -35,64 +35,64 @@ punct_map = (
     (u'>', (u'＞', u'〉', u'》', u'︾', u'﹀', u'﹥',)),
     (u'?', (u'？', u'﹖', u'⁇', u'⁈',)),
     (u'@', (u'＠', u'⊕', u'⊙', u'㊣', u'﹫', u'◉', u'◎',)),
-    (u'A', (u'Ａ',)),
-    (u'B', (u'Ｂ',)),
-    (u'C', (u'Ｃ',)),
-    (u'D', (u'Ｄ',)),
-    (u'E', (u'Ｅ',)),
-    (u'F', (u'Ｆ',)),
-    (u'G', (u'Ｇ',)),
-    (u'H', (u'Ｈ',)),
-    (u'I', (u'Ｉ',)),
-    (u'J', (u'Ｊ',)),
-    (u'K', (u'Ｋ',)),
-    (u'L', (u'Ｌ',)),
-    (u'M', (u'Ｍ',)),
-    (u'N', (u'Ｎ',)),
-    (u'O', (u'Ｏ',)),
-    (u'P', (u'Ｐ',)),
-    (u'Q', (u'Ｑ',)),
-    (u'R', (u'Ｒ',)),
-    (u'S', (u'Ｓ',)),
-    (u'T', (u'Ｔ',)),
-    (u'U', (u'Ｕ',)),
-    (u'V', (u'Ｖ',)),
-    (u'W', (u'Ｗ',)),
-    (u'X', (u'Ｘ',)),
-    (u'Y', (u'Ｙ',)),
-    (u'Z', (u'Ｚ',)),
+    (u'A', (u'Ａ', u'A')),
+    (u'B', (u'Ｂ', u'B')),
+    (u'C', (u'Ｃ', u'C')),
+    (u'D', (u'Ｄ', u'D')),
+    (u'E', (u'Ｅ', u'E')),
+    (u'F', (u'Ｆ', u'F')),
+    (u'G', (u'Ｇ', u'G')),
+    (u'H', (u'Ｈ', u'H')),
+    (u'I', (u'Ｉ', u'I')),
+    (u'J', (u'Ｊ', u'J')),
+    (u'K', (u'Ｋ', u'K')),
+    (u'L', (u'Ｌ', u'L')),
+    (u'M', (u'Ｍ', u'M')),
+    (u'N', (u'Ｎ', u'N')),
+    (u'O', (u'Ｏ', u'O')),
+    (u'P', (u'Ｐ', u'P')),
+    (u'Q', (u'Ｑ', u'Q')),
+    (u'R', (u'Ｒ', u'R')),
+    (u'S', (u'Ｓ', u'S')),
+    (u'T', (u'Ｔ', u'T')),
+    (u'U', (u'Ｕ', u'U')),
+    (u'V', (u'Ｖ', u'V')),
+    (u'W', (u'Ｗ', u'W')),
+    (u'X', (u'Ｘ', u'X')),
+    (u'Y', (u'Ｙ', u'Y')),
+    (u'Z', (u'Ｚ', u'Z')),
     (u'[', (u'「', u'［', u'『', u'【', u'｢', u'︻', u'﹁', u'﹃',)),
     (u'\\', (u'＼', u'↖', u'↘', u'﹨',)),
     (u']', (u'」', u'］', u'』', u'】', u'｣', u'︼', u'﹂', u'﹄',)),
     (u'^', (u'︿', u'〈', u'《', u'︽', u'﹤', u'＜',)),
     (u'_', (u'＿', u'╴', u'←', u'→',)),
     (u'`', (u'‵', u'′',)),
-    (u'a', (u'ａ',)),
-    (u'b', (u'ｂ',)),
-    (u'c', (u'ｃ',)),
-    (u'd', (u'ｄ',)),
-    (u'e', (u'ｅ',)),
-    (u'f', (u'ｆ',)),
-    (u'g', (u'ｇ',)),
-    (u'h', (u'ｈ',)),
-    (u'i', (u'ｉ',)),
-    (u'j', (u'ｊ',)),
-    (u'k', (u'ｋ',)),
-    (u'l', (u'ｌ',)),
-    (u'm', (u'ｍ',)),
-    (u'n', (u'ｎ',)),
-    (u'o', (u'ｏ',)),
-    (u'p', (u'ｐ',)),
-    (u'q', (u'ｑ',)),
-    (u'r', (u'ｒ',)),
-    (u's', (u'ｓ',)),
-    (u't', (u'ｔ',)),
-    (u'u', (u'ｕ',)),
-    (u'v', (u'ｖ',)),
-    (u'w', (u'ｗ',)),
-    (u'x', (u'ｘ',)),
-    (u'y', (u'ｙ',)),
-    (u'z', (u'ｚ',)),
+    (u'a', (u'ａ', u'a')),
+    (u'b', (u'ｂ', u'b')),
+    (u'c', (u'ｃ', u'c')),
+    (u'd', (u'ｄ', u'd')),
+    (u'e', (u'ｅ', u'e')),
+    (u'f', (u'ｆ', u'f')),
+    (u'g', (u'ｇ', u'g')),
+    (u'h', (u'ｈ', u'h')),
+    (u'i', (u'ｉ', u'i')),
+    (u'j', (u'ｊ', u'j')),
+    (u'k', (u'ｋ', u'k')),
+    (u'l', (u'ｌ', u'l')),
+    (u'm', (u'ｍ', u'm')),
+    (u'n', (u'ｎ', u'n')),
+    (u'o', (u'ｏ', u'o')),
+    (u'p', (u'ｐ', u'p')),
+    (u'q', (u'ｑ', u'q')),
+    (u'r', (u'ｒ', u'r')),
+    (u's', (u'ｓ', u's')),
+    (u't', (u'ｔ', u't')),
+    (u'u', (u'ｕ', u'u')),
+    (u'v', (u'ｖ', u'v')),
+    (u'w', (u'ｗ', u'w')),
+    (u'x', (u'ｘ', u'x')),
+    (u'y', (u'ｙ', u'y')),
+    (u'z', (u'ｚ', u'z')),
     (u'{', (u'｛', u'︷', u'﹛', u'〔', u'﹝', u'︹',)),
     (u'|', (u'｜', u'↑', u'↓', u'∣', u'∥', u'︱', u'︳', u'︴', u'￤',)),
     (u'}', (u'｝', u'︸', u'﹜', u'〕', u'﹞', u'︺',)),

diff --git a/src/BopomofoEngine.cc b/src/BopomofoEngine.cc
index cd51b69..6d827a0 100644 (file)
--- a/src/BopomofoEngine.cc
+++ b/src/BopomofoEngine.cc
@@ -3,7 +3,6 @@
 #include <libintl.h>
 #include <string>
 #include <cstdlib>
-#include <ibus.h>
 #include "RawEditor.h"
 #include "PunctEditor.h"
 #include "ExtEditor.h"

diff --git a/src/PinyinEngine.h b/src/PinyinEngine.h
index 398c028..e4f8cb8 100644 (file)
--- a/src/PinyinEngine.h
+++ b/src/PinyinEngine.h
@@ -66,6 +66,7 @@ private:
 
     enum {
         MODE_INIT = 0,          // init mode
+        MODE_PUNCT,             // punct mode
         MODE_RAW,               // raw mode
     #if 0
         MODE_ENGLISH,           // press v into English input mode

diff --git a/src/PunctTable.h b/src/PunctTable.h
index 1d1e533..936d83b 100644 (file)
--- a/src/PunctTable.h
+++ b/src/PunctTable.h
@@ -16,16 +16,16 @@ puncts[] = {
     "-", "…", "—", "－", "¯", "﹉", "￣", "﹊", "ˍ", "–", "‥", NULL,
     ".", "。", "·", "‧", "﹒", "．", NULL,
     "/", "／", "÷", "↗", "↙", "∕", NULL,
-    "0", "０", NULL,
-    "1", "１", NULL,
-    "2", "２", NULL,
-    "3", "３", NULL,
-    "4", "４", NULL,
-    "5", "５", NULL,
-    "6", "６", NULL,
-    "7", "７", NULL,
-    "8", "８", NULL,
-    "9", "９", NULL,
+    "0", "０", "0", NULL,
+    "1", "１", "1", NULL,
+    "2", "２", "2", NULL,
+    "3", "３", "3", NULL,
+    "4", "４", "4", NULL,
+    "5", "５", "5", NULL,
+    "6", "６", "6", NULL,
+    "7", "７", "7", NULL,
+    "8", "８", "8", NULL,
+    "9", "９", "9", NULL,
     ":", "：", "︰", "﹕", NULL,
     ";", "；", "﹔", NULL,
     "<", "＜", "〈", "《", "︽", "︿", "﹤", NULL,
@@ -33,64 +33,64 @@ puncts[] = {
     ">", "＞", "〉", "》", "︾", "﹀", "﹥", NULL,
     "?", "？", "﹖", "⁇", "⁈", NULL,
     "@", "＠", "⊕", "⊙", "㊣", "﹫", "◉", "◎", NULL,
-    "A", "Ａ", NULL,
-    "B", "Ｂ", NULL,
-    "C", "Ｃ", NULL,
-    "D", "Ｄ", NULL,
-    "E", "Ｅ", NULL,
-    "F", "Ｆ", NULL,
-    "G", "Ｇ", NULL,
-    "H", "Ｈ", NULL,
-    "I", "Ｉ", NULL,
-    "J", "Ｊ", NULL,
-    "K", "Ｋ", NULL,
-    "L", "Ｌ", NULL,
-    "M", "Ｍ", NULL,
-    "N", "Ｎ", NULL,
-    "O", "Ｏ", NULL,
-    "P", "Ｐ", NULL,
-    "Q", "Ｑ", NULL,
-    "R", "Ｒ", NULL,
-    "S", "Ｓ", NULL,
-    "T", "Ｔ", NULL,
-    "U", "Ｕ", NULL,
-    "V", "Ｖ", NULL,
-    "W", "Ｗ", NULL,
-    "X", "Ｘ", NULL,
-    "Y", "Ｙ", NULL,
-    "Z", "Ｚ", NULL,
+    "A", "Ａ", "A", NULL,
+    "B", "Ｂ", "B", NULL,
+    "C", "Ｃ", "C", NULL,
+    "D", "Ｄ", "D", NULL,
+    "E", "Ｅ", "E", NULL,
+    "F", "Ｆ", "F", NULL,
+    "G", "Ｇ", "G", NULL,
+    "H", "Ｈ", "H", NULL,
+    "I", "Ｉ", "I", NULL,
+    "J", "Ｊ", "J", NULL,
+    "K", "Ｋ", "K", NULL,
+    "L", "Ｌ", "L", NULL,
+    "M", "Ｍ", "M", NULL,
+    "N", "Ｎ", "N", NULL,
+    "O", "Ｏ", "O", NULL,
+    "P", "Ｐ", "P", NULL,
+    "Q", "Ｑ", "Q", NULL,
+    "R", "Ｒ", "R", NULL,
+    "S", "Ｓ", "S", NULL,
+    "T", "Ｔ", "T", NULL,
+    "U", "Ｕ", "U", NULL,
+    "V", "Ｖ", "V", NULL,
+    "W", "Ｗ", "W", NULL,
+    "X", "Ｘ", "X", NULL,
+    "Y", "Ｙ", "Y", NULL,
+    "Z", "Ｚ", "Z", NULL,
     "[", "「", "［", "『", "【", "｢", "︻", "﹁", "﹃", NULL,
     "\\", "＼", "↖", "↘", "﹨", NULL,
     "]", "」", "］", "』", "】", "｣", "︼", "﹂", "﹄", NULL,
     "^", "︿", "〈", "《", "︽", "﹤", "＜", NULL,
     "_", "＿", "╴", "←", "→", NULL,
     "`", "‵", "′", NULL,
-    "a", "ａ", NULL,
-    "b", "ｂ", NULL,
-    "c", "ｃ", NULL,
-    "d", "ｄ", NULL,
-    "e", "ｅ", NULL,
-    "f", "ｆ", NULL,
-    "g", "ｇ", NULL,
-    "h", "ｈ", NULL,
-    "i", "ｉ", NULL,
-    "j", "ｊ", NULL,
-    "k", "ｋ", NULL,
-    "l", "ｌ", NULL,
-    "m", "ｍ", NULL,
-    "n", "ｎ", NULL,
-    "o", "ｏ", NULL,
-    "p", "ｐ", NULL,
-    "q", "ｑ", NULL,
-    "r", "ｒ", NULL,
-    "s", "ｓ", NULL,
-    "t", "ｔ", NULL,
-    "u", "ｕ", NULL,
-    "v", "ｖ", NULL,
-    "w", "ｗ", NULL,
-    "x", "ｘ", NULL,
-    "y", "ｙ", NULL,
-    "z", "ｚ", NULL,
+    "a", "ａ", "a", NULL,
+    "b", "ｂ", "b", NULL,
+    "c", "ｃ", "c", NULL,
+    "d", "ｄ", "d", NULL,
+    "e", "ｅ", "e", NULL,
+    "f", "ｆ", "f", NULL,
+    "g", "ｇ", "g", NULL,
+    "h", "ｈ", "h", NULL,
+    "i", "ｉ", "i", NULL,
+    "j", "ｊ", "j", NULL,
+    "k", "ｋ", "k", NULL,
+    "l", "ｌ", "l", NULL,
+    "m", "ｍ", "m", NULL,
+    "n", "ｎ", "n", NULL,
+    "o", "ｏ", "o", NULL,
+    "p", "ｐ", "p", NULL,
+    "q", "ｑ", "q", NULL,
+    "r", "ｒ", "r", NULL,
+    "s", "ｓ", "s", NULL,
+    "t", "ｔ", "t", NULL,
+    "u", "ｕ", "u", NULL,
+    "v", "ｖ", "v", NULL,
+    "w", "ｗ", "w", NULL,
+    "x", "ｘ", "x", NULL,
+    "y", "ｙ", "y", NULL,
+    "z", "ｚ", "z", NULL,
     "{", "｛", "︷", "﹛", "〔", "﹝", "︹", NULL,
     "|", "｜", "↑", "↓", "∣", "∥", "︱", "︳", "︴", "￤", NULL,
     "}", "｝", "︸", "﹜", "〕", "﹞", "︺", NULL,
@@ -116,82 +116,82 @@ punct_table[] = {
     &puncts[96],    // "."
     &puncts[103],    // "/"
     &puncts[110],    // "0"
-    &puncts[113],    // "1"
-    &puncts[116],    // "2"
-    &puncts[119],    // "3"
-    &puncts[122],    // "4"
-    &puncts[125],    // "5"
-    &puncts[128],    // "6"
-    &puncts[131],    // "7"
-    &puncts[134],    // "8"
-    &puncts[137],    // "9"
-    &puncts[140],    // ":"
-    &puncts[145],    // ";"
-    &puncts[149],    // "<"
-    &puncts[157],    // "="
-    &puncts[166],    // ">"
-    &puncts[174],    // "?"
-    &puncts[180],    // "@"
-    &puncts[189],    // "A"
-    &puncts[192],    // "B"
-    &puncts[195],    // "C"
-    &puncts[198],    // "D"
-    &puncts[201],    // "E"
-    &puncts[204],    // "F"
-    &puncts[207],    // "G"
-    &puncts[210],    // "H"
-    &puncts[213],    // "I"
-    &puncts[216],    // "J"
-    &puncts[219],    // "K"
-    &puncts[222],    // "L"
-    &puncts[225],    // "M"
-    &puncts[228],    // "N"
-    &puncts[231],    // "O"
-    &puncts[234],    // "P"
-    &puncts[237],    // "Q"
-    &puncts[240],    // "R"
-    &puncts[243],    // "S"
-    &puncts[246],    // "T"
-    &puncts[249],    // "U"
-    &puncts[252],    // "V"
-    &puncts[255],    // "W"
-    &puncts[258],    // "X"
-    &puncts[261],    // "Y"
-    &puncts[264],    // "Z"
-    &puncts[267],    // "["
-    &puncts[277],    // "\\"
-    &puncts[283],    // "]"
-    &puncts[293],    // "^"
-    &puncts[301],    // "_"
-    &puncts[307],    // "`"
-    &puncts[311],    // "a"
-    &puncts[314],    // "b"
-    &puncts[317],    // "c"
-    &puncts[320],    // "d"
-    &puncts[323],    // "e"
-    &puncts[326],    // "f"
-    &puncts[329],    // "g"
-    &puncts[332],    // "h"
-    &puncts[335],    // "i"
-    &puncts[338],    // "j"
-    &puncts[341],    // "k"
-    &puncts[344],    // "l"
-    &puncts[347],    // "m"
-    &puncts[350],    // "n"
-    &puncts[353],    // "o"
-    &puncts[356],    // "p"
-    &puncts[359],    // "q"
-    &puncts[362],    // "r"
-    &puncts[365],    // "s"
-    &puncts[368],    // "t"
-    &puncts[371],    // "u"
-    &puncts[374],    // "v"
-    &puncts[377],    // "w"
-    &puncts[380],    // "x"
-    &puncts[383],    // "y"
-    &puncts[386],    // "z"
-    &puncts[389],    // "{"
-    &puncts[397],    // "|"
-    &puncts[408],    // "}"
-    &puncts[416],    // "~"
+    &puncts[114],    // "1"
+    &puncts[118],    // "2"
+    &puncts[122],    // "3"
+    &puncts[126],    // "4"
+    &puncts[130],    // "5"
+    &puncts[134],    // "6"
+    &puncts[138],    // "7"
+    &puncts[142],    // "8"
+    &puncts[146],    // "9"
+    &puncts[150],    // ":"
+    &puncts[155],    // ";"
+    &puncts[159],    // "<"
+    &puncts[167],    // "="
+    &puncts[176],    // ">"
+    &puncts[184],    // "?"
+    &puncts[190],    // "@"
+    &puncts[199],    // "A"
+    &puncts[203],    // "B"
+    &puncts[207],    // "C"
+    &puncts[211],    // "D"
+    &puncts[215],    // "E"
+    &puncts[219],    // "F"
+    &puncts[223],    // "G"
+    &puncts[227],    // "H"
+    &puncts[231],    // "I"
+    &puncts[235],    // "J"
+    &puncts[239],    // "K"
+    &puncts[243],    // "L"
+    &puncts[247],    // "M"
+    &puncts[251],    // "N"
+    &puncts[255],    // "O"
+    &puncts[259],    // "P"
+    &puncts[263],    // "Q"
+    &puncts[267],    // "R"
+    &puncts[271],    // "S"
+    &puncts[275],    // "T"
+    &puncts[279],    // "U"
+    &puncts[283],    // "V"
+    &puncts[287],    // "W"
+    &puncts[291],    // "X"
+    &puncts[295],    // "Y"
+    &puncts[299],    // "Z"
+    &puncts[303],    // "["
+    &puncts[313],    // "\\"
+    &puncts[319],    // "]"
+    &puncts[329],    // "^"
+    &puncts[337],    // "_"
+    &puncts[343],    // "`"
+    &puncts[347],    // "a"
+    &puncts[351],    // "b"
+    &puncts[355],    // "c"
+    &puncts[359],    // "d"
+    &puncts[363],    // "e"
+    &puncts[367],    // "f"
+    &puncts[371],    // "g"
+    &puncts[375],    // "h"
+    &puncts[379],    // "i"
+    &puncts[383],    // "j"
+    &puncts[387],    // "k"
+    &puncts[391],    // "l"
+    &puncts[395],    // "m"
+    &puncts[399],    // "n"
+    &puncts[403],    // "o"
+    &puncts[407],    // "p"
+    &puncts[411],    // "q"
+    &puncts[415],    // "r"
+    &puncts[419],    // "s"
+    &puncts[423],    // "t"
+    &puncts[427],    // "u"
+    &puncts[431],    // "v"
+    &puncts[435],    // "w"
+    &puncts[439],    // "x"
+    &puncts[443],    // "y"
+    &puncts[447],    // "z"
+    &puncts[451],    // "{"
+    &puncts[459],    // "|"
+    &puncts[470],    // "}"
+    &puncts[478],    // "~"
 };