Revision: 7333
Author:   deton.kih
Date:     Sat Oct 22 18:47:23 2011
Log:      * scm/tutcode.scm
  - (tutcode-begin-bushu-conversion):
    Change to show previous shown bushu prediction page
    when bushu conversion with new bushu is failed.
  - (tutcode-check-bushu-prediction-tc21,
     tutcode-check-bushu-prediction-tc23):
    Clear prediction-bushu-page-start for new bushu prediction.

http://code.google.com/p/uim/source/detail?r=7333

Modified:
 /trunk/scm/tutcode.scm

=======================================
--- /trunk/scm/tutcode.scm      Wed Oct 19 03:59:54 2011
+++ /trunk/scm/tutcode.scm      Sat Oct 22 18:47:23 2011
@@ -2513,6 +2513,7 @@
               ()))
            (resall (append res altres)))
       (tutcode-context-set-prediction-bushu! pc resall)
+      (tutcode-context-set-prediction-bushu-page-start! pc 0)
       (tutcode-bushu-prediction-make-page pc 0 show-candwin?))))

 ;;; Éô¼ó¹çÀ®ÊÑ´¹Ãæ¤Ëͽ¬ÆþÎϸõÊä¤ò¸¡º÷¤·¤Æ¸õÊä¥ê¥¹¥È¤òºîÀ®¤¹¤ë
@@ -2528,6 +2529,7 @@
             (list #f elem))
           gosei)))
       (tutcode-context-set-prediction-bushu! pc res)
+      (tutcode-context-set-prediction-bushu-page-start! pc 0)
       (tutcode-bushu-prediction-make-page pc 0 show-candwin?))))

 ;;; Éô¼ó¹çÀ®ÊÑ´¹¤Îͽ¬ÆþÎϸõÊä¤Î¤¦¤Á¡¢
@@ -3611,7 +3613,11 @@
           (tutcode-bushu-commit pc convchar)
           ;; ¹çÀ®¼ºÇÔ»þ¤ÏÆþÎϤ·Ä¾¤·¤òÂԤġ£Í½Â¬ÆþÎϸõÊä¤ÏºÆÉ½¼¨
           (if tutcode-use-bushu-prediction?
-            (tutcode-check-bushu-prediction pc prevchar)))))))
+ (if (string? (tutcode-context-prediction-bushu pc)) ; ÃÙ±äÂÔ¤ÁÃæ?
+              (tutcode-check-bushu-prediction pc prevchar)
+ ;; ͽ¬ÆþÎϸõÊä¥ê¥¹¥ÈºîÀ®ºÑ¤Î¾ì¹ç¡¢Á°²óɽ¼¨¤·¤¿¥Ú¡¼¥¸¤«¤éºÆÉ½¼¨
+              (tutcode-bushu-prediction-make-page pc
+                (tutcode-context-prediction-bushu-page-start pc) #t))))))))

 ;;; Éô¼ó¹çÀ®ÊÑ´¹¤ÇÊÑ´¹¤·¤¿Ê¸»ú¤ò³ÎÄꤹ¤ë
 ;;; @param convchar ÊÑ´¹¸å¤Îʸ»ú

Reply via email to