Revision: 47c37c9dac18
Author: KIHARA Hideto <[email protected]>
Date: Sat Apr 14 18:11:27 2012
Log: Add command to dump(commit) last help content shown on candidate
window.
* scm/tutcode-key-custom.scm
- (tutcode-auto-help-dump-sequence): New custom.
* scm/tutcode.scm
- Update comment for tutcode-auto-help-dump.
- (tutcode-table-in-vertical-candwin):
Add block delimiter when right block is empty for help dump.
- (tutcode-auto-help-dump): New function.
- (tutcode-custom-set-mazegaki/bushu-start-sequence!):
Add check of tutcode-auto-help-dump-sequence.
http://code.google.com/p/uim/source/detail?r=47c37c9dac18
Modified:
/scm/tutcode-key-custom.scm
/scm/tutcode.scm
=======================================
--- /scm/tutcode-key-custom.scm Sun Apr 8 00:07:30 2012
+++ /scm/tutcode-key-custom.scm Sat Apr 14 18:11:27 2012
@@ -129,6 +129,12 @@
(N_ "[TUT-Code] display last auto help")
(N_ "long description will be here"))
+(define-custom 'tutcode-auto-help-dump-sequence ""
+ '(tutcode-keys1)
+ '(string ".*")
+ (N_ "[TUT-Code] commit last auto help content")
+ (N_ "long description will be here"))
+
(define-custom 'tutcode-katakana-commit-key '()
'(tutcode-keys1)
'(key)
=======================================
--- /scm/tutcode.scm Sun Apr 8 01:34:29 2012
+++ /scm/tutcode.scm Sat Apr 14 18:11:27 2012
@@ -203,13 +203,18 @@
;;; ¨§¨¡¨«¨¡¨«¨¡¨«¨¡¨«¨¡¨© ¨§¨¡¨¡¨¡¨¡¨¡¨¡¨«¨¡¨«¨¡¨«¨¡¨¡¨¡¨«¨¡¨©
;;; ¨¢ ¨¢ ¨¢d ¨¢ ¨¢e ¨¢ ¨¢2a(ݵ¢¥ÎÓ´Ì)¨¢ ¨¢ ¨¢ ¨¢ ¨¢
;;; ¨¦¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨¡¨¡¨¡¨¡¨¡¨ª¨¡¨ª¨¡¨ª¨¡¨¡¨¡¨ª¨¡¨¥
-;;; ** ľ¶á¤Ëɽ¼¨¤·¤¿¼«Æ°¥Ø¥ë¥×¤ÎºÆɽ¼¨
-;;; tutcode-auto-help-redisplay-sequence¤Ë°Ê²¼¤Î¤è¤¦¤Ë¥¡¼¥·¡¼¥±¥ó¥¹¤ò
-;;; ÀßÄꤹ¤ë¤È»ÈÍѲÄǽ¤Ë¤Ê¤ê¤Þ¤¹¡£
-;;; (define tutcode-auto-help-redisplay-sequence "al-")
;;; * ʸ»ú¥Ø¥ë¥×ɽ¼¨µ¡Ç½(tutcode-help-sequence)
;;; ¥«¡¼¥½¥ë°ÌÃÖľÁ°¤Îʸ»ú¤Î¥Ø¥ë¥×(ÂǤÁÊý)¤òɽ¼¨¤·¤Þ¤¹¡£
;;; (uim¤Îsurrounding text API¤ò»È¤Ã¤Æ¥«¡¼¥½¥ë°ÌÃÖľÁ°¤Îʸ»ú¤ò¼èÆÀ)
+;;; *
ľ¶á¤Ëɽ¼¨¤·¤¿(¼«Æ°)¥Ø¥ë¥×¤ÎºÆɽ¼¨(tutcode-auto-help-redisplay-sequence)
+;;; * ľ¶á¤Ëɽ¼¨¤·¤¿(¼«Æ°)¥Ø¥ë¥×¤Î¥À¥ó¥×(tutcode-auto-help-dump-sequence)
+;;;
¸õÊ䥦¥£¥ó¥É¥¦¤Ëɽ¼¨¤·¤¿¥Ø¥ë¥×ÆâÍƤò°Ê²¼¤Î¤è¤¦¤Êʸ»úÎó¤Ë¤·¤Æcommit¤·¤Þ¤¹¡£
+;;; (Éô¼ó¹çÀ®¥·¡¼¥±¥ó¥¹(Îã:"ÎÓ´Ì")¤ò¥³¥Ô¡¼¤·¤Æ¡¢¸å¤Ç¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤«¤é
+;;; Á°ÃÖ·¿Éô¼ó¹çÀ®ÊÑ´¹¤Îpreedit¤Ø¥Ú¡¼¥¹¥È¤·¤ÆÊÑ´¹¤·¤¿¤¤¾ì¹ç¸þ¤±)
+;;; | | | | || | | | | ||
+;;; | | | | b|| | | | f | ||
+;;; | 3| | | || | | |1(Í«)| ||
+;;; | | d| | e||2a(ݵ¢¥ÎÓ´Ì)| | | | ||
;;;
;;; ¡ÚÊä´°/ͽ¬ÆþÎÏ¡¦½Ï¸ì¥¬¥¤¥É¡Û
;;; +¡ÖÊä´°¡×:³ÎÄêºÑʸ»úÎó¤ËÂФ·¤Æ¡¢Â³¤¯Ê¸»úÎó¤Î¸õÊä¤òɽ¼¨¤·¤Þ¤¹¡£
@@ -1926,7 +1931,7 @@
;;; uim-el¤Ç(setq uim-candidate-display-inline t)¤Î¾ì¹çÅù)
;;; @param cands ("ɽ¼¨Ê¸»úÎó" "¥é¥Ù¥ëʸ»úÎó" "Ãí¼á")¤Î¥ê¥¹¥È
;;; @return ÊÑ´¹¸å¤Î¥ê¥¹¥È¡£
-;;; Îã:(("*¤ä|*¤Þ|*¤«|*¤¢|*¤Ï|*¡×|*¡Û|*¡Ä|*¡¦|*¡É" "q" "") ...)
+;;; Îã:(("*¤ä|*¤Þ|*¤«|*¤¢|*¤Ï||*¡×|*¡Û|*¡Ä|*¡¦|*¡É||" "q" "") ...)
(define (tutcode-table-in-vertical-candwin cands)
(let*
((layout (if (null? uim-candwin-prog-layout)
@@ -2012,7 +2017,7 @@
(cdr
(let colloop
((col (- colmax 1))
- (line-sep ()))
+ (line-sep (if (= colmax 10) '("||") ())))
(if (negative? col)
line-sep
(colloop
@@ -2591,6 +2596,23 @@
(length help)
tutcode-nr-candidate-max-for-kigou-mode))))
+;;;
¼«Æ°¥Ø¥ë¥×:ľÁ°¤Î¥Ø¥ë¥×¤Ç¸õÊ䥦¥£¥ó¥É¥¦¤Ëɽ¼¨¤·¤¿ÆâÍƤò¥À¥ó¥×¡¦commit¤¹¤ë
+;;; (Éô¼ó¹çÀ®¥·¡¼¥±¥ó¥¹(Îã:"¸À¢¥¢¥À¾°ìÁá")¤ò¥³¥Ô¡¼¤·¤¿¤¤¾ì¹çÍÑ)
+(define (tutcode-auto-help-dump state pc)
+ (if (eq? state 'tutcode-state-on)
+ (let ((help (tutcode-context-auto-help pc)))
+ (if (and help
+ (> (length help) 0)
+ (not (eq? (car help) 'delaytmp)))
+ (let ((linecands
+ (append-map
+ (lambda (elem)
+ (list (car elem) "\n"))
+ (if tutcode-use-pseudo-table-style?
+ help
+ (tutcode-table-in-vertical-candwin help)))))
+ (tutcode-commit pc (apply string-append linecands) #t #t))))))
+
;;; preeditɽ¼¨¤ò¹¹¿·¤¹¤ë¡£
(define (tutcode-do-update-preedit pc)
(let ((stat (tutcode-context-state pc))
@@ -6475,6 +6497,8 @@
'(tutcode-postfix-seq2kanji-9-start))
(make-subrule tutcode-auto-help-redisplay-sequence
'(tutcode-auto-help-redisplay))
+ (make-subrule tutcode-auto-help-dump-sequence
+ (list tutcode-auto-help-dump))
(make-subrule tutcode-help-sequence
'(tutcode-help))
(make-subrule tutcode-help-clipboard-sequence
