Changeset 31184 for lang/ruby

Timestamp:

03/14/09 17:12:51 (4 years ago)

Author:

winebarrel

Message:

support wakati gaki

Location:

lang/ruby/aqtk-ruby/trunk/aqtk

Files:

• AqLicense.txt (deleted)
• bin (deleted)
• ext/kakasi.c (modified) (4 diffs)
• lib/i386-mswin32/aqtk.so (modified) (previous)

lang/ruby/aqtk-ruby/trunk/aqtk/ext/kakasi.c

@@ -172 +172 @@
 }
 
+static VALUE rb_aqtk_kakasi_wakati(VALUE self, VALUE v_str) {
+  VALUE v_retval;
+  char *kakasi_argv[] = { "kakasi", "-w" };
+  char *retval;
+  VALUE eval_argv[] = { rb_str_new2("gsub(/��\b/s, '��.gsub(' ', '')") };
+
+  Check_Type(v_str, T_STRING);
+        
+  if (kakasi_getopt_argv(2, kakasi_argv) != 0) {
+    kakasi_close_kanwadict();
+    rb_raise(rb_eAquesTalk_Kakasi_Error, "Init kakasi failed");
+  }
+
+  retval = kakasi_do(RSTRING_PTR(v_str));
+  v_retval = rb_str_buf_new2(retval);
+
+  if (*retval) {
+    kakasi_free(retval);
+  }
+
+  kakasi_close_kanwadict();
+  v_retval = rb_obj_instance_eval(1, eval_argv, v_retval);
+
+  return v_retval;
+}
+
 static VALUE rb_aqtk_kakasi_kakasi(VALUE self, VALUE v_str) {
   VALUE v_opt, v_retval;
@@ -258 +284 @@
 
 static VALUE rb_aqtk_kakasi_convert_number(VALUE self, VALUE v_str) {
-  VALUE eval_argv[] = { rb_str_new2("gsub(/\\d+/) {|m| \"<NUM VAL=#{m}>\" }") };
+  VALUE eval_argv[] = { rb_str_new2("gsub(/\\d+/s) {|m| \"<NUM VAL=#{m}>\" }") };
   return rb_obj_instance_eval(1, eval_argv, v_str);
 }
@@ -264 +290 @@
 static VALUE rb_aqtk_kakasi_filter(VALUE self, VALUE v_str) {
   v_str = rb_funcall(self, rb_intern("convert_charcode"), 1, v_str);
+  v_str = rb_funcall(self, rb_intern("wakati"), 1, v_str);
   v_str = rb_funcall(self, rb_intern("kakasi"), 1, v_str);
   v_str = rb_funcall(self, rb_intern("normalize"), 1, v_str);
@@ -277 +304 @@
   rb_define_method(rb_cAquesTalk_Kakasi, "initialize", rb_aqtk_kakasi_initialize, -1);
   rb_define_private_method(rb_cAquesTalk_Kakasi, "convert_charcode", rb_aqtk_kakasi_convert_charcode, 1);
+  rb_define_private_method(rb_cAquesTalk_Kakasi, "wakati", rb_aqtk_kakasi_wakati, 1);
   rb_define_private_method(rb_cAquesTalk_Kakasi, "kakasi", rb_aqtk_kakasi_kakasi, 1);
   rb_define_private_method(rb_cAquesTalk_Kakasi, "normalize", rb_aqtk_kakasi_normalize, 1);