Commit: f41f5a5a335a7fc91e60fd786971ab66199db087 - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: f41f5a5a335a7fc91e60fd786971ab66199db087 (tree)
• Time: 2012-12-22 10:14:01
• Author: KIHARA Hideto <deton@m1.i...>
• Commiter: KIHARA Hideto

Log Message

Change acquiring yomi of postfix katakana conversion to be customizable.

* scm/tutcode.scm

- (tutcode-postfix-katakana-char-list): New variable.
- (tutcode-begin-postfix-katakana-conversion):

Change to call tutcode-postfix-katakana-acquire-char?

- (tutcode-postfix-katakana-acquire-char?):

New function extracted from tutcode-begin-postfix-katakana-conversion.

Change Summary

• modified: scm/tutcode.scm

Incremental Difference

--- a/scm/tutcode.scm
+++ b/scm/tutcode.scm
@@ -609,6 +609,9 @@
 (define tutcode-postfix-mazegaki-terminate-char-list
   '("\n" "\t" " " "、" "。" "，" "．" "・" "「" "」" "（" "）"))
 
+;;; 後置型カタカナ変換の対象取得時に、(ひらがなに加えて)対象にする文字のリスト
+(define tutcode-postfix-katakana-char-list '("ー"))
+
 ;;; 後置型漢字→入力シーケンス変換の読み取得時に、読みに含めない文字のリスト。
 ;;; スペースを含む英単語の変換を楽にしたい場合、'(":")等にすることを想定。
 ;;; ("\n" "\t"は別扱い。tutcode-delete-leading-delimiter-on-postfix-kanji2seq?
@@ -3999,15 +4002,15 @@
 ;;; @return 取得した文字列(文字列の逆順リスト)
 (define (tutcode-postfix-katakana-acquire-yomi pc yomi-len)
   (let ((former-seq (tutcode-postfix-acquire-text pc
-                     (or yomi-len tutcode-mazegaki-yomi-max)))
-        ;; カタカナへの変換対象文字(ひらがな、・ー)かどうかを返す
-        (tokatakana?
-          (lambda (str)
-            (or (tutcode-hiragana? str)
-                (member str '("・" "ー"))))))
+                     (or yomi-len tutcode-mazegaki-yomi-max))))
     (if yomi-len
       former-seq
-      (take-while tokatakana? former-seq))))
+      (take-while tutcode-postfix-katakana-acquire-char? former-seq))))
+
+;;; 後置型カタカナ変換対象文字(ひらがな、ー)かどうかを返す
+(define (tutcode-postfix-katakana-acquire-char? char)
+  (or (tutcode-hiragana? char)
+      (member char tutcode-postfix-katakana-char-list)))
 
 ;;; ひらがなかどうか
 (define (tutcode-hiragana? s)