Author: ek.kato
Date: Mon Jan 5 07:56:19 2009
New Revision: 5690
Modified:
uim-chewing-trunk/NEWS
uim-chewing-trunk/configure.ac
uim-chewing-trunk/scm/chewing-custom.scm
uim-chewing-trunk/scm/chewing.scm
uim-chewing-trunk/src/chewing.c
Log:
* scm/chewing.scm
* scm/chewing-custom.scm
- Fix support for DACHEN CP26 keyboard in libchewing-0.3.1.
* configure.ac : Bump version. Require libchewing version <
0.3.2.
* src/chewing.c (get_nth_candidate) : Bug fix.
* NEWS : Update.
Modified: uim-chewing-trunk/NEWS
==============================================================================
--- uim-chewing-trunk/NEWS (original)
+++ uim-chewing-trunk/NEWS Mon Jan 5 07:56:19 2009
@@ -1,3 +1,10 @@
+Overview of changes from 0.0.3.1 to 0.0.3.2
+==
+* Fix
+ * Fix candidate window behavior
+ * Fix support for DACHEN CP26 and HANYU_PINYIN keyboard type.
+
+
Overview of changes from 0.0.2 to 0.0.3
==
* Support libchewing >= 0.3.091
Modified: uim-chewing-trunk/configure.ac
==============================================================================
--- uim-chewing-trunk/configure.ac (original)
+++ uim-chewing-trunk/configure.ac Mon Jan 5 07:56:19 2009
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([uim-chewing], [0.0.3.1])
+AC_INIT([uim-chewing], [0.0.3.2])
AM_INIT_AUTOMAKE(1.8.3)
AC_CONFIG_HEADER([config.h])
@@ -11,7 +11,7 @@
AM_MAINTAINER_MODE
-PKG_CHECK_MODULES(CHEWING, [chewing > 0.3.0])
+PKG_CHECK_MODULES(CHEWING, [chewing > 0.3.0 chewing < 0.3.2])
CHEWING_DATADIR=`$PKG_CONFIG chewing --variable=datadir`
AC_DEFINE_UNQUOTED(CHEWING_DATADIR, "$CHEWING_DATADIR", [Chewing data dir])
Modified: uim-chewing-trunk/scm/chewing-custom.scm
==============================================================================
--- uim-chewing-trunk/scm/chewing-custom.scm (original)
+++ uim-chewing-trunk/scm/chewing-custom.scm Mon Jan 5 07:56:19 2009
@@ -79,6 +79,7 @@
(list 'chewing-kbd-et26 (_ "ET26") (_ "ET26 Keyboard"))
(list 'chewing-kbd-dvorak (_ "DVORAK") (_ "DVORAK Keyboard"))
(list 'chewing-kbd-dvorak-hsu (_ "DVORAK HSU") (_ "DVORAK HSU
Keyboard"))
+ (list 'chewing-kbd-dachen-cp26 (_ "DACHEN CP26") (_ "DACHEN CP26
Keyboard"))
(list 'chewing-kbd-hanyu-pinyin (_ "HANYU PINYIN") (_ "HANYU PINYIN
Keyboard")))
(_ "Keyboard layout type")
(_ "long description will be here."))
Modified: uim-chewing-trunk/scm/chewing.scm
==============================================================================
--- uim-chewing-trunk/scm/chewing.scm (original)
+++ uim-chewing-trunk/scm/chewing.scm Mon Jan 5 07:56:19 2009
@@ -66,7 +66,8 @@
(chewing-kbd-et26 . 5)
(chewing-kbd-dvorak . 6)
(chewing-kbd-dvorak-hsu . 7)
- (chewing-kbd-hanyu-pinyin . 8)))
+ (chewing-kbd-dachen-cp26 . 8)
+ (chewing-kbd-hanyu-pinyin . 9)))
(define chewing-lib-initialized? #f)
Modified: uim-chewing-trunk/src/chewing.c
==============================================================================
--- uim-chewing-trunk/src/chewing.c (original)
+++ uim-chewing-trunk/src/chewing.c Mon Jan 5 07:56:19 2009
@@ -645,9 +645,7 @@
if (!ucc)
return uim_scm_f();
- n = ucc->cc->output->pci->pageNo * ucc->cc->output->pci->nChoicePerPage;
-
- return uim_scm_make_str(ucc->cc->output->pci->totalChoiceStr[n + nth]);
+ return uim_scm_make_str(ucc->cc->output->pci->totalChoiceStr[nth]);
}
static uim_lisp
