[Prime-cvs] CVS update: prime/lib

Back to archive index

Hiroyuki Komatsu komat****@users*****
2004年 12月 9日 (木) 18:20:51 JST


Index: prime/lib/session.rb
diff -u prime/lib/session.rb:1.4.4.7 prime/lib/session.rb:1.4.4.8
--- prime/lib/session.rb:1.4.4.7	Thu Dec  9 15:53:33 2004
+++ prime/lib/session.rb	Thu Dec  9 18:20:51 2004
@@ -1,5 +1,5 @@
 # session.rb
-# $Id: session.rb,v 1.4.4.7 2004/12/09 06:53:33 komatsu Exp $
+# $Id: session.rb,v 1.4.4.8 2004/12/09 09:20:51 komatsu Exp $
 #
 # Copyright (C) 2001 Satoru Takabayashi <sator****@namaz*****>
 # Copyright (C) 2002, 2003, 2004 Hiroyuki Komatsu <komat****@taiya*****>
@@ -327,7 +327,15 @@
     suikyo = PrimeTypeConv::initialize_suikyo()
     composer = SuikyoComposer.new(suikyo.table)
     composer.set_reverse_table(PRIME_ENV['suikyo_reverse_tables'])
-    composer.hybrid_typing = PRIME_ENV['hybrid_typing']
+
+    ## Setting hybrid_typing.
+    if PRIME_ENV['hybrid_typing'].nil? then
+      if PRIME_ENV['typing_method'] == 'romaji' then
+        composer.hybrid_typing = true
+      end
+    else
+      composer.hybrid_typing = PRIME_ENV['hybrid_typing']
+    end
 
     @session_no += 1
     @sessions[@session_no.to_s] = composer
Index: prime/lib/prime-config.rb.in
diff -u prime/lib/prime-config.rb.in:1.2.4.5 prime/lib/prime-config.rb.in:1.2.4.6
--- prime/lib/prime-config.rb.in:1.2.4.5	Thu Dec  9 15:53:33 2004
+++ prime/lib/prime-config.rb.in	Thu Dec  9 18:20:51 2004
@@ -1,5 +1,5 @@
 # prime-config.rb: Setting of global variables and default variables for PRIME.
-# $Id: prime-config.rb.in,v 1.2.4.5 2004/12/09 06:53:33 komatsu Exp $
+# $Id: prime-config.rb.in,v 1.2.4.6 2004/12/09 09:20:51 komatsu Exp $
 #
 # Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****>
 #     All rights reserved.
@@ -41,8 +41,8 @@
 PRIME_ENV['typing_method']          = PRIME_TYPING_METHOD_DEFAULT
 
 ## If true, PRIME considers the validation of the preedition.
-## ex). "あっplえ" => "apple".
-PRIME_ENV['hybrid_typing']          = true
+## ex). "あっplえ" => "apple".  The available values are [nil, true, false].
+PRIME_ENV['hybrid_typing']          = nil
 
 #PRIME_ENV['suikyo_tables']         = ["romaji"]
 #PRIME_ENV['suikyo_reverse_tables'] = ["romaji_reverse"]


Prime-cvs メーリングリストの案内
Back to archive index