Merge pull request #217 from rypervenche/carpalx

Add Carpalx keyboard layout support
chewing · Apr 11, 2016 · 9ae6594 · 9ae6594
2 parents b2fb12a + 8d0c416
commit 9ae6594
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/doc/libchewing.texi b/doc/libchewing.texi
@@ -471,6 +471,7 @@ The string @var{str} might be one of the following layouts:
 @item @code{KB_HANYU_PINYIN}
 @item @code{KB_THL_PINYIN}
 @item @code{KB_MPS2_PINYIN}
+@item @code{KB_CARPALX}
 @end itemize
 
 See also the @code{chewing_kbtype_*} enumeration functions.

diff --git a/include/internal/bopomofo-private.h b/include/internal/bopomofo-private.h
@@ -40,6 +40,7 @@ enum {
     KB_HANYU_PINYIN,
     KB_THL_PINYIN,
     KB_MPS2_PINYIN,
+    KB_CARPALX,
     KB_TYPE_NUM
 };
 

diff --git a/include/internal/chewing-private.h b/include/internal/chewing-private.h
@@ -86,6 +86,7 @@ typedef enum KBTYPE {
     KBTYPE_HANYU_PINYIN,
     KBTYPE_LUOMA_PINYIN,
     KBTYPE_MSP2,            /* Mandarin Phonetic Symbols II */
+    KBTYPE_CARPALX,
     KBTYPE_COUNT
 } KBTYPE;
 

diff --git a/src/chewingio.c b/src/chewingio.c
@@ -61,7 +61,8 @@ const char *const kb_type_str[] = {
     "KB_DACHEN_CP26",
     "KB_HANYU_PINYIN",
     "KB_THL_PINYIN",
-    "KB_MPS2_PINYIN"
+    "KB_MPS2_PINYIN",
+    "KB_CARPALX"
 };
 
 const char *const DICT_FILES[] = {

diff --git a/src/common/key2pho.c b/src/common/key2pho.c
@@ -82,6 +82,7 @@ static const char *const key_str[KBTYPE_COUNT] = {
     "1qaz2wsxedcrfv5tgbyhnujm8ik,9ol.0p;/-7634",        /* Hanyu Pinyin */
     "1qaz2wsxedcrfv5tgbyhnujm8ik,9ol.0p;/-7634",        /* Luoma Pinyin */
     "1qaz2wsxedcrfv5tgbyhnujm8ik,9ol.0p;/-7634",        /* secondary Bopomofo Pinyin */
+    "1qdz2gsxmtclnv5wrjyikfap8ue,9bo.0;h/-7634",        /* Carpalx */
 };
 
 /*

diff --git a/test/test-keyboard.c b/test/test-keyboard.c
@@ -32,6 +32,7 @@ static const char *const KEYBOARD_STRING[] = {
     "KB_HANYU_PINYIN",
     "KB_THL_PINYIN",
     "KB_MPS2_PINYIN",
+    "KB_CARPALX",
 };
 
 static const int KEYBOARD_DEFAULT_TYPE = 0;