[uim-commit] r759 - branches/composer/scm

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-03-06 21:44:20 -0800 (Sun, 06 Mar 2005)
New Revision: 759

Modified:
   branches/composer/scm/anthy.scm
   branches/composer/scm/evmap-csv.scm
   branches/composer/scm/japanese-nicola.scm
Log:
* scm/evmap-csv.scm
  - (event-exp->csv-cell): Escape special characters

* scm/japanese-nicola.scm
  - (ja-nicola-hiragana-ruleset, ja-nicola-katakana-ruleset,
    ja-nicola-halfkana-ruleset): Comment out
    ja-nicola-jp106-pseudo-thumb-shift-ruleset in accordance with
    dedicated key-event translator

* scm/anthy.scm
  - (anthy-set-mod-state-handler, anthy-reset-mod-state-handler):
    Remove debug print


Modified: branches/composer/scm/anthy.scm
===================================================================
--- branches/composer/scm/anthy.scm	2005-03-07 02:49:12 UTC (rev 758)
+++ branches/composer/scm/anthy.scm	2005-03-07 05:44:20 UTC (rev 759)
@@ -303,8 +303,6 @@
     (lambda (ac)
       (let ((mod-state (bitwise-or (anthy-context-mod-state ac)
 				   mod)))
-	(puts "anthy-set-mod-state-handler: ")
-	(print mod-state)
 	(anthy-context-set-mod-state! ac mod-state)))))
 
 (define anthy-reset-mod-state-handler
@@ -312,8 +310,6 @@
     (lambda (ac)
       (let ((mod-state (bitwise-and (anthy-context-mod-state ac)
 				    (bitwise-not mod))))
-	(puts "anthy-reset-mod-state-handler: ")
-	(print mod-state)
 	(anthy-context-set-mod-state! ac mod-state)))))
 
 (define anthy-register-modifier-action

Modified: branches/composer/scm/evmap-csv.scm
===================================================================
--- branches/composer/scm/evmap-csv.scm	2005-03-07 02:49:12 UTC (rev 758)
+++ branches/composer/scm/evmap-csv.scm	2005-03-07 05:44:20 UTC (rev 759)
@@ -76,7 +76,12 @@
      ((string? exp)
       (if (or (string=? exp " ")
 	      (string=? exp ",")
-	      (string=? exp "\""))
+	      (string=? exp "\"")
+	      (string=? exp "#")
+	      (string=? exp "'")
+	      (string=? exp "`")
+	      (string=? exp "(")
+	      (string=? exp ")"))
 	  (string-escape exp)
 	  exp))
      ((symbol? exp)

Modified: branches/composer/scm/japanese-nicola.scm
===================================================================
--- branches/composer/scm/japanese-nicola.scm	2005-03-07 02:49:12 UTC (rev 758)
+++ branches/composer/scm/japanese-nicola.scm	2005-03-07 05:44:20 UTC (rev 759)
@@ -254,19 +254,22 @@
   (append
    ja-nicola-hiragana-core-ruleset
    ja-nicola-hiragana-postfixed-voiced-consonant-ruleset
-   ja-nicola-jp106-pseudo-thumb-shift-ruleset))
+   ;;ja-nicola-jp106-pseudo-thumb-shift-ruleset
+   ))
 
 (define ja-nicola-katakana-ruleset
   (append
    ja-nicola-katakana-core-ruleset
    ja-nicola-katakana-postfixed-voiced-consonant-ruleset
-   ja-nicola-jp106-pseudo-thumb-shift-ruleset))
+   ;;ja-nicola-jp106-pseudo-thumb-shift-ruleset
+   ))
 
 (define ja-nicola-halfkana-ruleset
   (append
    ja-nicola-halfkana-core-ruleset
    ja-nicola-halfkana-postfixed-voiced-consonant-ruleset
-   ja-nicola-jp106-pseudo-thumb-shift-ruleset))
+   ;;ja-nicola-jp106-pseudo-thumb-shift-ruleset
+   ))
 
 (define ja-nicola-hiragana-ruletree
   (evmap-parse-ruleset ja-nicola-hiragana-ruleset))