Author: yamakenz
Date: Sun Aug 19 05:21:03 2007
New Revision: 4866
Modified:
trunk/scm/deprecated-util.scm
trunk/scm/ichar.scm
trunk/scm/util.scm
Log:
* scm/deprecated-util.scm
- (string-to-list): Fix length attribute of the string counted in
EUC-JP, with counted in ISO-8859-1. This fixed the broken
candidate strings on uim-prime
* scm/ichar.scm
- (ucs->utf8-string): Likewise counted in UTF-8 -> ISO-8859-1
* scm/util.scm
- (string-split): Fix a comment
Modified: trunk/scm/deprecated-util.scm
==============================================================================
--- trunk/scm/deprecated-util.scm (original)
+++ trunk/scm/deprecated-util.scm Sun Aug 19 05:21:03 2007
@@ -73,7 +73,10 @@
(with-char-codec "EUC-JP"
(lambda ()
(map! (lambda (c)
- (list->string (list c)))
+ (let ((str (list->string (list c))))
+ (with-char-codec "ISO-8859-1"
+ (lambda ()
+ (%%string-reconstruct! str)))))
(reverse! (string->list s)))))))
;; TODO: replace with symbol-append
Modified: trunk/scm/ichar.scm
==============================================================================
--- trunk/scm/ichar.scm (original)
+++ trunk/scm/ichar.scm Sun Aug 19 05:21:03 2007
@@ -65,7 +65,10 @@
(lambda (ucs)
(with-char-codec "UTF-8"
(lambda ()
- (list->string (list (integer->char ucs)))))))
+ (let ((str (list->string (list (integer->char ucs)))))
+ (with-char-codec "ISO-8859-1"
+ (lambda ()
+ (%%string-reconstruct! str))))))))
;;
;; R5RS-like character procedures
Modified: trunk/scm/util.scm
==============================================================================
--- trunk/scm/util.scm (original)
+++ trunk/scm/util.scm Sun Aug 19 05:21:03 2007
@@ -120,7 +120,7 @@
(apply string-append (list-join str-list sep))))
;; Split pattern has been changed from uim 1.5.0. See
-;; doc/COMPATIBILITY and test-util.scm.
+;; doc/COMPATIBILITY and test-uim-util.scm.
(define string-split
(lambda (str sep)
(let ((slen (string-length str))
